/[Apache-SVN]
ViewVC logotype

Revision 1805422


Jump to revision: Previous Next
Author: stsp
Date: Fri Aug 18 13:17:55 2017 UTC (6 years, 7 months ago)
Changed paths: 1
Log Message:
Fix issue 4688, "New conflict resolver bug in tracing history".

* subversion/libsvn_client/conflicts.c
  (conflict_tree_get_details_local_missing): Start scanning the parent's
   history from its checked out peg-revision, where it is guaranteed to exist.
   The previous code was using the old/new revisions recorded in conflict
   data as peg revisions for the parent path. But these revisions do not
   necessarily relate to the conflict victim's parent path, they relate
   to the merge operation which was attempted on the victim.


Changed paths

Path Details
Directorysubversion/trunk/subversion/libsvn_client/conflicts.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26