Mercurial > evolve
diff tests/test-obsolete.t @ 2754:21f06d932231
test: update test output to match b11e8c67fb0f
hg debugobsolete now issues a message about the obsoleted changesets.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 21 Jul 2017 10:51:37 +0200 |
parents | e22de367fc74 |
children | 2280461343e5 07b9fcf8b6d3 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Fri Jul 21 10:27:13 2017 +0200 +++ b/tests/test-obsolete.t Fri Jul 21 10:51:37 2017 +0200 @@ -33,6 +33,7 @@ $ getid 3 0d3f46688ccc6e756c7e96cf64c391c411309597 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 + obsoleted 1 changesets $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) @@ -96,6 +97,7 @@ $ mkcommit "obsol_c'" # 4 (on 1) created new head $ hg debugobsolete `getid 3` `getid 4` + obsoleted 1 changesets $ qlog 4 - 725c380fe99b @@ -210,6 +212,7 @@ created new head 1 new unstable changesets $ hg debugobsolete `getid 5` `getid 6` + obsoleted 1 changesets $ qlog 6 - 95de7fc6918d @@ -268,6 +271,7 @@ created new head 1 new unstable changesets $ hg debugobsolete `getid 6` `getid 7` + obsoleted 1 changesets $ hg pull -R ../other-new . pulling from . searching for changes @@ -357,6 +361,7 @@ created new head 1 new unstable changesets $ hg debugobsolete `getid 7` `getid 8` + obsoleted 1 changesets $ cd ../other-new $ hg up -q 3 $ hg pull ../local/ @@ -441,6 +446,7 @@ - 1f0dee641bb7 $ hg debugobsolete `getid 9` #kill + obsoleted 1 changesets $ hg up null -q # to be not based on 9 anymore $ qlog 8 @@ -549,6 +555,7 @@ $ mkcommit "obsol_d'''" created new head $ hg debugobsolete `getid 11` `getid 12` + obsoleted 1 changesets $ hg push ../other-new --traceback pushing to ../other-new searching for changes