[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

tree conflicts

From: Andreas Schnederle-Wagner - Futureweb.at <schnederle_at_futureweb.at>
Date: Wed, 15 Apr 2009 18:25:44 +0200

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?!

Running on server 1.6.1 and Tortoise-SVN client 1.6.1 Build 16129 -
32bit

Thank you, bye
Andreas

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-15 18:25:55 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.