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

No tree conflict with incoming deleted folder?

From: Jacob Weber <jacob_at_jacobweber.com>
Date: Sun, 18 Oct 2009 16:15:27 -0700 (PDT)

Say I have a branch with a folder "a", and I add a file inside it. At the same time, on the trunk someone deletes "a". If I merge the trunk into my branch, shouldn't this show up as a tree conflict? Currently it just shows up as an incoming deletion of "a". This is using SVN 1.6.5 client and server. Here's an example:

# create trunk
svn mkdir -m '' svn://localhost/repos/temp
svn mkdir -m '' svn://localhost/repos/temp/a

# create branch
svn cp -m '' svn://localhost/repos/temp svn://localhost/repos/temp2

# remove dir on trunk
svn rm -m '' svn://localhost/repos/temp/a

# add something inside dir on branch
svn mkdir -m '' svn://localhost/repos/temp2/a/b

# merge trunk into branch
svn co svn://localhost/repos/temp2
cd temp2
svn merge svn://localhost/repos/temp
--- Merging r10566 through r10568 into '.':
D a

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2408748

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-19 01:16:16 CEST

This is an archived mail posted to the Subversion Users mailing list.