In the conflict resolver, fix a bug with 'incoming delete vs local delete'.
The problem was found during manual testing:
$ svn st
M .
! C beta2
> local missing or deleted or moved away, incoming file delete or move upon merge
$ svn resolve
Searching tree conflict details for 'beta2' in repository:
Checking r13... done
Searching tree conflict details for 'beta2' in repository:
Checking r14...svn: warning: apr_err=SVN_ERR_FS_NOT_FOUND
svn: warning: W160013: File not found: revision 14, path '/trunk/beta2'
Where ^/trunk/beta2 is a copy of ^/trunk/beta, which got merged to ^/branch in
r10, and ^/branch/beta2 was deleted in r14, and ^/trunk/beta2 deleted in r13.
We now merge ^/trunk into a WC of ^/branch, and get a delete vs delete conflict.
(I'm going to add a regression test for this situation later.)
The resolver wrongly assumed that the incoming new node exists in the
repository at the incoming new revision. With that fixed, the resolver works:
$ svn resolve
Searching tree conflict details for 'beta2' in repository:
Checking r13... done
Searching tree conflict details for 'beta2' in repository:
Checking r13... done
Searching tree conflict details for 'beta2' in repository:
Checking r14... done
Tree conflict on 'beta2':
Item merged from
'^/branch/beta2@10'
to
'^/trunk/beta2@14'
was deleted by stsp in r13.
No such file or directory was found in the merge target working copy.
The item was deleted in r14 by stsp.
Select: (p) postpone, (r) accept current working copy state,
(i) ignore incoming deletion, (a) accept incoming deletion,
(h) help, (q) quit resolution:
* subversion/libsvn_client/conflicts.c
(find_revision_for_suspected_deletion): Drive-by indentation fix.
(conflict_tree_get_details_local_missing): If the related node does not
exist at the revision recorded in conflict data, we must try to find a
deleted revision for the related node before we can search for the deleted
revision of the conflict victim itself.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1751893 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
