2009/4/16 Andreas Schnederle-Wagner - Futureweb.at <schnederle_at_futureweb.at>:
>> 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?
>
> In our main dev. tree there are templates (smarty website templates)
> which are not needed in our external dev tree (would just confuse our
> external developers) - that's why they are deleted in the external dev
> tree - they just develop modules for this cms - but since there are
> often changes in lot's of directories we make a merge starting at the
> root level - so the template directory (with its deleted directories
> within) is merged too - and always produces the tree conflicts.
>
> Is there any way to "permanent" mark a deleted directory as "I'm deleted
> and I don't want to produce tree conflicts"? ;-)
Instead of deleting them, why don't you get your external developers
to do a sparse checkout that excludes these directories?
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=1746674
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-16 14:38:06 CEST