[SVN-4166] multiple merge editor drives which add then delete a subtree fail

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: ---
• Component/s: libsvn_client
• Labels: merge-tracking
• Assignee: Unassigned
• Reporter: Paul Burba
• Created: 23/Apr/12 20:03
• Updated: 27/Oct/18 16:29
• Resolved: 23/Apr/12 20:37

Description

As a user reported here, http://svn.haxx.se/dev/archive-2012-04/0404.shtml,
there is a bug when a merge split into separate editor drives adds a subtree in
one drive, then deletes it in another.

For example:

Two separate merge operations work:

  >svn merge -c2 %URL%/branches/branchA .
  --- Merging r2 into '.':
  A    file1.txt
  --- Recording mergeinfo for merge of r2 into '.':
   U   .

  >svn merge -c3 %URL%/branches/branchA .
  --- Merging r3 into '.':
  D    file1.txt
  --- Recording mergeinfo for merge of r3 into '.':
   G   .

An equivalent single editor drive merge works:

  >svn merge -r1:3 %URL%/branches/branchA .
  --- Recording mergeinfo for merge of r2 through r3 into '.':
   U   .

But a single operations with two editor drives fails:

  >svn merge -c2,3 %URL%/branches/branchA .
  --- Merging r2 into '.':
  A    file1.txt
  --- Recording mergeinfo for merge of r2 into '.':
   U   .
  --- Merging r3 into '.':
  D    file1.txt
  --- Recording mergeinfo for merge of r3 into '.':
   G   .
  ..\..\..\subversion\svn\util.c:913: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\merge.c:10899: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\merge.c:10853: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\merge.c:10853: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\merge.c:10823: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\merge.c:8842: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\merge.c:7691: (apr_err=155010)
  ..\..\..\subversion\libsvn_client\mergeinfo.c:194: (apr_err=155010)
  ..\..\..\subversion\libsvn_wc\node.c:876: (apr_err=155010)
  ..\..\..\subversion\libsvn_wc\node.c:876: (apr_err=155010)
  ..\..\..\subversion\libsvn_wc\wc_db.c:6765: (apr_err=155010)
  ..\..\..\subversion\libsvn_wc\wc_db.c:6666: (apr_err=155010)
  ..\..\..\subversion\libsvn_wc\wc_db.c:6651: (apr_err=155010)
  svn: E155010: The node
'C:\SVN\src-branch-1.7.x\Debug\subversion\tests\cmdline\svn-test-work\working_copies\TST\branches\branchB\file1.txt'
was not found.