Tree conflicts case 2

Hi folks,

Developer A renames foo.c to bar.c and commits.
Developer B edits foo.c and updates.

Subversion spots the tree conflict but doesn't know where the file has
been moved to (the conflict is on foo.c and only bar.c has the
copy-source info). This means that the conflict editor cannot help
much. If the user can locate the destination file (bar.c) manually,
would it be possible for the conflict editor to merge B's changes to
foo.c into bar.c?

Assuming that such a merge is even possible, what about the UI? I
suggest providing a showlog button for the current folder. This won't
help if the file has been moved elsewhere in the hierarchy, but some
of the time it will. Once you have identified the destination file,
the conflict editor needs a file-open dialog to identify it and do the
merge. I guess it would then also revert foo.c possibly leaving it as
an unversioned file in the WC, or simply deleting/recycling it. I
favour recycling here.

The conflict editor therefore needs a showlog button, and a third
option button [Locate rename target and merge changes...] which goes
to the file open dialog starting in the current directory.

Case 1 might also need an option like this as it is not always
possible to find where the deleted file was moved to.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1205657
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].