Re: [Monotone-devel] fatal: std::logic_error: roster_merge.cc:528: invariant 'I(left_name == right_name)' violated

[Markus Schiltknecht]

Hi,

IMO, a good bug report deserves an equally good fix. In revision 
d779238b.. I hope to have achieved that. The error message now looks like:

conflict: duplicate name 'x' for the directory 'foo/bar'

..in the normal case. If you rename a parent directory as well, as in 
your case, it says:

conflict: duplicate name 'x' for the directory
          named 'foo/bar' on the left and
          named 'foo/baz' on the right.

That's certainly better than failing on a bogus invariant.

(The fix will not appear before monotone 0.40).

Regards

Markus