No tree conflict with incoming deleted folder?

[Jacob Weber]

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://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2408746

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].

[Jacob Weber]

Sorry -- meant to post this to the subversion list. Please ignore.

> 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://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2408747

To unsubscribe from this discussion, e-mail: [users-unsubscribe@...].