re[Monotone-devel] name target conflicts: nodes 7371, 676 both wanted parent 0

[address@hidden 28]

I'm trying to merge two Pidgin revisions in my local monotone database. The
reason being a patch works up to one revision, and from that on applies fine
but stops working.
Here are my steps....hope someone can help me understand what's the matter.
I add the new branch:

mtn -d pidgin.mtn --branch=im.pidgin.cpw.khc.msnp14.ticket1187 setup 

add my workspace files inside it:

mtn add . -R 

then I commit them into the database:

mtn -d pidgin.mtn commit --message='try'

After that, I try checking out the new branch and it works fine, so I go on
trying to merge it with new revisions:

mtn -d pidgin.mtn explicit_merge d42c2c6500b8f7eb1ad6340caf7f1b95d9b02c1b
h:im.pidgin.cpw.khc.msnp14.ticket1187 im.pidgin.cpw.khc.msnp14.ticket1187

Doing so, Monotone reports me this:

expanding selection h:im.pidgin.cpw.khc.msnp14.ticket1187
expanded in 929db41c0cad0600c57da6da67425e537e462d0c
mtn [left] d42c2c6500b8f7eb1ad6340caf7f1b95d9b02c1b
mtn [right] 929db41c0cad0600c57da6da67425e537e462d0c
mtn warning: rename target conflicts: nodes 7371, 676 both wanted parent 0,
name
mtn warning: resolve non-content conflicts and then try again.
merge failed due to unresolved conflicts

What's up? And what should I do to solve this issue?
-- 
View this message in context: 
http://www.nabble.com/rename-target-conflicts%3A-nodes-7371%2C-676-both-wanted-parent-0-tf4689311.html#a13402268
Sent from the monotone-devel mailing list archive at Nabble.com.