[Monotone-devel] pluck failure - successive pluck in the same directory

[Pavel Cahyna]

Hello,

I have encountered an annoying problem whit pluck. I try to pluck two
revisions. The first one adds a directory, possibly with some files. Pluck
succeeds. Tse other revision adds a file under that directory. Pluck of
this revision (after the first one) fails with:

mtn: warning: orphaned node conflict on node <x>, dead parent <y>, name <f>
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts

Besides the fact that the error message is horribly user unfriendly, this
should in my humble (and naive) opinion Just Work. I guess it Just Works
with cvs up -j... -j...

Attached is a test case as requested on #monotone .

Pavel

pluckfail.sh
Description: Text document