Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 17:29:47 -0500] rev 9440
Merge qprev/qnext backout
Matt Mackall <mpm@selenic.com> [Mon, 14 Sep 2009 16:39:24 -0500] rev 9439
Backed out premature qprev/qnext removal
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 11 Sep 2009 16:58:19 +0200] rev 9438
Add new flag [-1] to synopsis of qapplied/qunapplied
Greg Ward <greg-hg@gerg.ca> [Tue, 08 Sep 2009 17:58:59 -0400] rev 9437
Improve some docstrings relating to changegroups and prepush().
Andrey Somov <py4fun@gmail.com> [Wed, 09 Sep 2009 11:12:36 +0200] rev 9436
improve code readability
Martin Geisler <mg@lazybytes.net> [Thu, 10 Sep 2009 10:31:12 +0200] rev 9435
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 08 Sep 2009 01:26:15 +0200] rev 9434
test-convert-git: Use ~ instead of ^
Solaris sh interprets ^ as pipe symbol and the test thus failed in strange
ways. git can however use of HEAD~ instead of HEAD^.
Mads Kiilerich <mads@kiilerich.com> [Thu, 10 Sep 2009 01:56:25 +0200] rev 9433
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.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:32:16 +0200] rev 9432
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:29:14 +0200] rev 9431
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>