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

[Thomas Keller]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Markus Schiltknecht schrieb:
>> That suggests (at least to me) there is a conflict in the name of the
>> directory and not in a name within the directory. But it could be that
>> I am not a native English speaker.
>  [...]
> I'm open to suggestions for better wordings. 

I translated "name" to the German word for "entry", so an improved
message could be

conflict: duplicate entry 'x' in the directory
           named 'bar' on the left and
           named 'foo' on the right.

> (And I think there's a
> whole branch dedicated to improve these non-content confilct (ncc) error
> messages. Or at least there was some recent discussion.)

This was already merged into head, AFAIK.

Thomas.

- --
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4-svn0 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFH7Mngaf7NlBYNEJIRAg39AKDTdvq1IM1vioLN/U9njq7OPJyMSACbBbif
257iM1PsBZTPSkNfKNVJqpU=
=DWZd
-----END PGP SIGNATURE-----