transplant: Add trailing LF in tmp file for filtering Transplant filtering used a tmp file ending with the (stripped) commit message and thus no final LF. Text files not ending with LF is usually not used on Unix and is thus wrong ;-) The missing LF had bad consequences because Solaris sed chokes on unterminated input lines, so echo -n foo|sed 's,o,0,g' doesn't output anything, and the filter used in tests/test-transplant thus stripped the last (and only) line in the message away on solaris.

Merge with crew-stable

convert: fix history topology when using hg.tagsbranch When using hg.tagsbranch, all conversions fail at transcribing the source repo topology with conversion scenarios interleaving: - initial repo conversion, - then upstream tag - then later incremental conversion The problem is caused by the usage of the last source revid as source revid for the tagnode in the revision map. On a later incremental conversion, when resolving some child commit of the true last source revid, convert will parent the nodes to the tag node. If using tagsbranch you get a bad topology where all incremental commit nodes end up in the tag branch. Analysis and test by Edouard Gomez <ed.gomez@free.fr>

Merge with crew-stable

merge: exclude common ancestor from --preview (issue1818)

inotify: _inotify.c: bugfix: remove_watch has to return PyNone on success We are not currently using that API function in inotify, hence the reason for the "silent" bug. But returning NULL here causes the interpreter to crash. Let's keep code clean for reusers :) The whole "bail" logic was unneeded here.