Re: tree conflicts

2009/4/15 Andreas Schnederle-Wagner - Futureweb.at <schnederle_at_futureweb.at>:
> Hello,
>
> we have the following svn layout
> 1) main development tree
> 2) external dev tree
>
> In our external dev tree some directories are intentionally deleted -
> but every time we merge changes from our 1st tree to 2nd we encounter
> TREE CONFLICTS - is this intended as the directories in tree 2 are
> deleted intentionally?!
> And if this behavior is normal - what would you suggest to do to get rid
> of those tree conflicts?!

Yes, this is normal. You are trying to merge a change to a directory
into a deleted directory. The way to get rid of the conflict is simply
to mark as resolved after you merge.

Silly question - why have you deleted those directories and then try
to merge changes into them?

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=1732211
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].