Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Subversion Wiki" for
The "ResolvingIncomingMoves" page has been changed by StefanSperling:
typos; discuss a native way of handling the merge operation case
The conflict resolver scans the revision log to match up copies and deletions.
See 'struct repos_move_info' and 'find_moves_in_revision()' in the file
subversion/libsvn_client/conflicts.c. While this approach is not perfect
- (it does not corrrectly handle deletions which happened inside copies,
+ (it does not correctly handle deletions which happened inside copies,
for instance) it is good enough to support users during conflict resolution
in many use cases.
@@ -23, +23 @@
with a locally modified file A/f.
- After A is moved to B in the repostory the user updates to the HEAD
+ After A is moved to B in the repository the user updates to the HEAD
revision. The NODES table will now look as follows:
|| op_depth || local_relpath || presence ||
@@ -243, +243 @@
With changes from the trunk merged in.
+ This could be achieved by first reverting B, then moving A to B locally,
+ and running the appropriate merges to get changes from trunk.
+ However, the resolver has no way of knowing whether reverting B would
+ destroy any local changes the user made to B after the merge.
+ Ideally, such changes would be retained.