Mercurial > evolve
diff tests/test-obsolete.t @ 4840:62b60fc1983d
test: change to output around transaction timing
CORE-TEST-OUTPUT-UPDATE: d7304434390f
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 12 Sep 2019 12:35:42 +0200 |
parents | c9798965b1f4 |
children | 015cdd3fa469 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Tue Sep 10 07:38:46 2019 +0200 +++ b/tests/test-obsolete.t Thu Sep 12 12:35:42 2019 +0200 @@ -33,6 +33,7 @@ $ getid 3 0d3f46688ccc6e756c7e96cf64c391c411309597 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 + 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -97,6 +98,7 @@ $ mkcommit "obsol_c'" # 4 (on 1) created new head $ hg debugobsolete `getid 3` `getid 4` + 1 new obsolescence markers obsoleted 1 changesets $ qlog 4 @@ -215,6 +217,7 @@ 1 new orphan changesets created new head $ hg debugobsolete `getid 5` `getid 6` + 1 new obsolescence markers obsoleted 1 changesets $ qlog 6 @@ -274,6 +277,7 @@ 1 new orphan changesets created new head $ hg debugobsolete `getid 6` `getid 7` + 1 new obsolescence markers obsoleted 1 changesets $ hg pull -R ../other-new . pulling from . @@ -365,6 +369,7 @@ 1 new orphan changesets created new head $ hg debugobsolete `getid 7` `getid 8` + 1 new obsolescence markers obsoleted 1 changesets $ cd ../other-new $ hg up -q 3 @@ -428,6 +433,7 @@ $ hg id -n 9 $ hg debugobsolete `getid 0` `getid 9` + 1 new obsolescence markers 1 new phase-divergent changesets 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 # at core level the warning is not issued @@ -452,6 +458,7 @@ - 1f0dee641bb7 $ hg debugobsolete `getid 9` #kill + 1 new obsolescence markers obsoleted 1 changesets $ hg up null -q # to be not based on 9 anymore $ qlog @@ -562,6 +569,7 @@ $ mkcommit "obsol_d'''" created new head $ hg debugobsolete `getid 11` `getid 12` + 1 new obsolescence markers obsoleted 1 changesets $ hg push ../other-new --traceback pushing to ../other-new @@ -688,6 +696,7 @@ phases: 3 draft phase-divergent: 1 changesets $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` + 1 new obsolescence markers 2 new content-divergent changesets $ hg log -r 'contentdivergent()' changeset: 12:6db5e282cb91