resolving tree conflicts

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.

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?

Mit freundlichen Grüßen
Dr. Hartmut Niemann

Siemens AG
MO MLT LM EN CCI 1
Werner-von-Siemens-Str. 67
91052 Erlangen, Deutschland
Tel.: +49 9131 7-34264
Fax: +49 9131 7-26254
mailto:hartmut.niemann_at_siemens.com

Siemens Aktiengesellschaft: Vorsitzender des Aufsichtsrats: Gerhard Cromme; Vorstand: Joe Kaeser, Vorsitzender; Roland Busch, Lisa Davis, Klaus Helmrich, Janina Kugel, Siegfried Russwurm, Ralf P. Thomas; Sitz der Gesellschaft: Berlin und München, Deutschland; Registergericht: Berlin Charlottenburg, HRB 12300, München, HRB 6684; WEEE-Reg.-Nr. DE 23691322

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3158698

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-02-05 10:19:33 CET