Re: resolving tree conflicts

Hi Hartmut,
>
> Hello!
>
> Can anybody help me understand how resolving tree conflicts should be
> done?
>
> A coworker has moved some directories around.
>
> Now I updated my working copy and got around 15 tree conflicts.
>
> I have no easy way of resolving tree conflicts from the update dialog,
> which would be really nice if it was possible.
>
> After closing the update dialog, I choose “resolve” from the menu.
>
> I see “Status” is “added(+), tree conflict” which is odd, because
> nobody added them recently in my working copy,
>
> but someone removed them from the server.
>
By choosing "resolve" in that menu, you told TSVN that the current state
in ur working directory is what you like to have to have the tree
conflict resolved.
Since the "moved"/old files were still present in your working copy,
TSVN took that as you want these files to be kept there. Since they were
gone on the server, that translated to an add of these files.

>
> I choose “undo add” from the context menu and am asked “do you want to
> revert <dirname>”?
>
> I find this odd for two reasons.
>
> (1) I chose “undo add” and am asked to confirm action “revert”.
>
> (2) I ‘revert’ a change and I ‘undo’ an add, but in this case,
>
> neither is actually what I do. I would prefer an action along
>
> “accept the server side by removing everything that was unchanged in
> WC and remove all the rest from the
>
> working copy database (with a choice between removing it from the file
> system or keeping it as “not under version control”?)”.
>
> On files, i can (IIRC) chose “resolve conflict using “theirs”” and get
> what I want.
>
> What is the best way of resolving such tree conflicts? Can the
> situation be improved
>
> or is it just me who doesn’t understand how it works?
>
The best process heavily depends on the actual situation you are facing
with the tree conflict, the set up of the files/directories your project
chose and the workflow you are using.
In principle here's how I handle tree conflicts during an update due to
modifications in files in my working directory due to the files being moved.
1. For all tree conflicts I select: "Resolve later" in the conflict
resolution dialog which pops up during the update.
2. I check out the files which got moved and their new location.
3. I use Winmerge to compare my version of the file in the old location
with the file in the new location and port over all changes I want.
4. I remove the old files using TSVN -> Delete (context menu)
5. The conflicts should now have been marked automatically as resolved
and I'm all fine.

Note that this is just one use-case... I'm going with different
approaches for different use cases, but this one is one of the most
common ones.
Hope that help.

-- 
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3158705
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].