Re: AW: resolving tree conflicts

Hi Hartmut,

given your previous message I take it that you did some local changes to
some of the files in that external directory and therefore it had
problems upon update.
Another situation might occur when you use certain older TSVN/SVN
versions which had some difficulties under certain circumstances to deal
with incoming removal of externals to the WC. To make sure that's not
the case, I suggest you either run 1.9.3+ or 1.8.14+ based SVN versions
of TSVN.

The easiest way to resolve that can be:
- save all the changes you have in ur WC in the external folder and it's
parent folder somewhere
- remove the parent of the external
- do an update
- reapply the changes

Note: externals are handled via SVN properties on the parent directory
of the actual external. If there's a conflict/issue on that side, you'd
also try to resolve that one and spare you the time of the
backup/reapply process I pointed out above.

> Hello!
>
> Follow up question:
>
> If in the process of cleaning this mess a reference to an external
> gets stuck: how do I clean it up?
>
> D:\PRJ\Tools\040_python\020_Tools>svn status SG_LINT
>
> X SG_LINT\030_Src\lib\sg
>
> Performing status on external item at 'SG_LINT\030_Src\lib\sg':
>
> D:\PRJ\Tools\040_python\020_Tools>
>
> The directory “SG_LINT” is one of those which do not exist any longer
> in HEAD.
>
> How do I get rid of the external entry?
>
> 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
> mailto:hartmut.niemann_at_siemens.com
>
> *Von:*Niemann, Hartmut [mailto:hartmut.niemann_at_siemens.com]
> *Gesendet:* Freitag, 5. Februar 2016 10:19
> *An:* users_at_tortoisesvn.tigris.org
> *Betreff:* 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
>

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