subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Julian Foad <>
Subject New conflict resolver bug in tracing history
Date Tue, 18 Jul 2017 11:27:42 GMT
I just ran into the following bug. It appears that the conflict resolver
doesn't properly follow branch (copy) history when searching for details.

$ svn sw ^/subversion/branches/shelve-checkpoint3

$ svn merge ^/subversion/trunk@1802151
--- Merging r1801593 through r1802151 into '.':
   C tools/dist/templates/nightly-candidates.ezt
--- Recording mergeinfo for merge of r1801593 through r1802151 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 1
Searching tree conflict details for
'tools/dist/templates/nightly-candidates.ezt' in repository:
Checking r1801838...svn: warning: apr_err=SVN_ERR_FS_NOT_FOUND
svn: warning: W160013:
path not found
svn: E155027: Failure occurred resolving one or more conflicts

The conflict is a delete-delete: the file 'nightly-candidates.ezt' was
deleted in branch shelve-checkpoint@r1801823 (note: that's a different
branch) and also in trunk@r1801838. That branch was branched to
shelve-checkpoint3 in r1802284.

The problem is that the look-up of the parent full-path (including
branch name) fails because the branch 'shelve-checkpoint3' didn't exist
in r1802151.

- Julian

View raw message