Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 20:41:53 +0200] rev 10944
filemerge: use working dir parent as ancestor for backward wdir merge
I checked the tests, they were bogus in the first place
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 21:44:21 +0200] rev 10943
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 20:30:31 +0200] rev 10942
filectx: _fileid isn't normalized, use _filenode instead
_fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we
should use something stable for comparisons (like _filenode).
Martin Geisler <mg@lazybytes.net> [Mon, 19 Apr 2010 20:49:09 +0200] rev 10941
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10940
convert: write "working copy" instead of "wc"
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10939
convert: mark strings for translation
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10938
convert: write "repository" instead of "repo"
We should strive to avoid slang in our messages to the users.