Login | Register
My pages Projects Community openCollabNet

Discussions > users > [Subclipse-users] No tree conflict with incoming deleted folder?

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

[Subclipse-users] No tree conflict with incoming deleted folder?

Author jacobweber
Full name Jacob Weber
Date 2009-10-18 16:13:27 PDT
Message 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

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Subclipse-users] No tree conflict with incoming deleted folder? jacobweber Jacob Weber 2009-10-18 16:13:27 PDT
     RE: [Subclipse-users] No tree conflict with incoming deleted folder? jacobweber Jacob Weber 2009-10-18 16:14:41 PDT
Messages per page: