On 13.06.2016 16:10, Stefan Sperling wrote:
On Mon, Jun 13, 2016 at 01:51:49PM -0000, s...@apache.org wrote:
Author: stsp
Date: Mon Jun 13 13:51:49 2016
New Revision: 1748236
URL: http://svn.apache.org/viewvc?rev=1748236&view=rev
Log:
When merging an incoming file move, record this move in the working copy.
This makes merged file moves appear as having been "replayed" on the local
branch, rather than as a delete and a copy from the merge source branch.
File content changes are preserved and may raise a text conflict if applicable.
* subversion/libsvn_client/conflicts.c
(resolve_incoming_move_file_text_merge): If the conflict was flagged by a
merge operation, run a meta-data only move instead of just a deletion.
* subversion/tests/libsvn_client/conflicts-test.c
(test_option_merge_incoming_move_file_text_merge): Update test expectations.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c
Just to raise awareness:
As of this commit, interactive conflict resolution allows simple file
moves to be merged between branches and boil down the text-conflicts.
Example below.
Sorry for being late to the party, but this is excellent work!
Can you say what the main limitations are and whether you
plan to remove them? My guess would be: files only, one
move per file & conflict resolution cycle, no cyclic renames.
-- Stefan^2.
