Simon Large wrote:
> ... 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.
>
That's exactly why I don't like TSVN to 'help out' with resolving those
conflicts: "it is likely", "will hopefully be", ...
See the problem?
> 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 :-(
And "crawl the WC" is a very expensive operation (maybe not for the test
wcs the scripts create but for big wcs it is).
Yes, I know the situation is not good, and we leave the users without
much help to resolve those conflicts. But we just don't have the
information to help out much. And gathering that information by guessing
and crawling whole working copies is not something I like to do.
Guessing is dangerous - I'd rather have a user just mark a conflict as
resolved (which would be the same as in pre 1.6 clients) than doing
something wrong. If a user knows enough about the conflict, he still can
resolve it manually - if he doesn't, it's better to not try messing
around but simply mark the conflict as resolved.
Stefan
--
___
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=1207749
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-22 09:26:43 CET