[Monotone-devel] "usage constraint violated"

[Neil Conway]

I was attempting to merge the heads of a branch, but the merge command
failed. The last few lines of "monotone --debug merge" are:

monotone: conflict: maps left add map and right add map disagree:
todo/todo.tex -> 29f057523f1cbacf2ff9d46c33076110fc7fc2df and
1e5229a8db9a63a6d6ba0ac0eb1cc0ca83307142
monotone: commands.cc:561: usage constraint 'N(merge3(ancestor_map,
left_map, right_map, app, merger, merged_map, left_renames.mapping,
right_renames.mapping))' violated
monotone: db.execute("ROLLBACK")
monotone: misuse: failed to 3-way merge manifests
34951bd28ff1eedd62df37a6346dfe797abcce26 and
54477ae04f54c905417a627d7c7479d9a4575453 via ancestor
95ce848ce960f81b824562c5ee5f57bef27dbdd2

I'd be happy to post the rest of the debug output -- just let me know if
that's helpful. "monotone heads" for this branch is:

branch 'pgdocs' is currently unmerged:
34951bd28ff1eedd62df37a6346dfe797abcce26 address@hidden
2004-10-29T03:20:01
54477ae04f54c905417a627d7c7479d9a4575453 address@hidden
2004-10-27T03:45:13

This is using Monotone 0.14. Recent activity on this branch involved a
colleague ("swm") adding a new file to the branch, committing and
pushing the updates to my database. swm's working copy did not include
the latest version of "todo.tex" (which I had updated locally and
committed to my db -- swm did not pull those changes before pushing his
changes to me). I found a reference to a similar-looking problem in the
archives[1], but that thread claims the issue was fixed.

Let me know if there's any more information I can provide. I eventually
fixed the problem (my colleague sync'ed his DB and repushed the changes
to me -- not sure exactly how, but it works now :P), but I thought I'd
report it.

-Neil