Sun, 06 Sep 2009 15:32:16 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Sep 2009 15:32:16 +0200] rev 9432
Merge with crew-stable
Sun, 06 Sep 2009 15:29:14 +0200 convert: fix history topology when using hg.tagsbranch
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>
Sat, 05 Sep 2009 19:39:46 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Sep 2009 19:39:46 +0200] rev 9430
Merge with crew-stable
Sat, 05 Sep 2009 18:56:51 +0200 merge: exclude common ancestor from --preview (issue1818)
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Sep 2009 18:56:51 +0200] rev 9429
merge: exclude common ancestor from --preview (issue1818)
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip