[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree conflicts case 2 for directories

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Sat, 21 Feb 2009 23:06:50 +0000

... is not nearly as simple as it is for files.

Developer A renames folder Project1 to Project2 and commits
Developer B edits Project1/a/b/c/foo.c and updates

The tree conflict is marked on Project1. In order to help with the
merge TSVN would have to crawl Project1 and look for modified files,
then for each one ask the user to find the new location. In practice
it is likely that the files will not have been renamed, so once the
user has located the directory rename target, the files will hopefully
be in the same relative position.

As before the conflict editor needs a third button to locate the
rename target folder, but then it would need crawl the conflicted WC
folder and show a list of modified files with checkboxes for merging
the changes. Files which have no direct match in the new folder would
have to be greyed out as unmergeable. This is not a trivial change :-(

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=1205815
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-22 00:06:58 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.