Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-2853

do_single_file_merge() lacks comprehensive "Replace-style merge" capability

VotersWatch issueWatchersLinkCloneUpdate Comment AuthorReplace String in CommentUpdate Comment VisibilityDelete Comments
    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • 1.0.1
    • 1.5.0
    • libsvn_client
    • None

    Description

      As demonstrated in issue 2822, do_single_file_merge() fails to handle reverts of
Replace merges.

      http://subversion.tigris.org/issues/show_bug.cgi?id=2822

      Attachments

        1. 1_single_file_merge_handle_replaced.patch
          7 kB
          Subversion Importer
        2. 2_single_file_merge_handle_replaced.log
          0.3 kB
          Subversion Importer

        Issue Links

        blocks

        Task - A task that needs to be done. SVN-2822 Propagate implied merge info on WC -> WC copy/move operations

        • Critical - Crashes, loss of data, severe memory leak.
        • Closed
        is depended upon by

        Task - A task that needs to be done. SVN-2822 Propagate implied merge info on WC -> WC copy/move operations

        • Critical - Crashes, loss of data, severe memory leak.
        • Closed

        Activity
          This comment will be Viewable by All Users Viewable by All Users
          Cancel

          People

            Unassigned Unassigned
            dlr Daniel Rall
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Slack

                Issue deployment