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

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

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 1.0.1
    • Fix Version/s: 1.5.0
    • Component/s: libsvn_client
    • Labels:
      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. 2_single_file_merge_handle_replaced.log
          0.3 kB
          Subversion Importer
        2. 1_single_file_merge_handle_replaced.patch
          7 kB
          Subversion Importer

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved: