Mercurial > evolve
diff tests/test-obsolete.t @ 45:d89453a10991
include hash in test.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Thu, 08 Sep 2011 14:02:29 +0200 |
parents | b243c10a5fbe |
children | 3b0364fc822f |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Sep 08 12:01:38 2011 +0200 +++ b/tests/test-obsolete.t Thu Sep 08 14:02:29 2011 +0200 @@ -11,7 +11,7 @@ > hg ci -m "add $1" > } - $ alias qlog="hg log --template='{rev}\n'" + $ alias qlog="hg log --template='{rev} {node|short}\n'" $ hg init local $ cd local $ mkcommit a # 0 @@ -26,98 +26,34 @@ Test that obsolete changeset are hidden - $ hg log - changeset: 3:0d3f46688ccc - tag: tip - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c - - changeset: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add b - - changeset: 0:1f0dee641bb7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add a - - $ hg log --hidden - changeset: 3:0d3f46688ccc - tag: tip - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c - - changeset: 2:4538525df7e2 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add c - - changeset: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add b - - changeset: 0:1f0dee641bb7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add a - - $ hg log -r 'obsolete()' --hidden - changeset: 2:4538525df7e2 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add c - + $ qlog + 3 0d3f46688ccc + 1 7c3bad9141dc + 0 1f0dee641bb7 + $ qlog --hidden + 3 0d3f46688ccc + 2 4538525df7e2 + 1 7c3bad9141dc + 0 1f0dee641bb7 + $ qlog -r 'obsolete()' --hidden + 2 4538525df7e2 test obsolete changeset with no-obsolete descendant $ hg up 1 -q $ mkcommit "obsol_c'" # 4 (on 1) created new head $ hg debugobsolete 4 3 - $ hg log - changeset: 4:725c380fe99b - tag: tip - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c' - - changeset: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add b - - changeset: 0:1f0dee641bb7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add a - - $ hg log -r 'obsolete()' --hidden - changeset: 2:4538525df7e2 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add c - - changeset: 3:0d3f46688ccc - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c - + $ qlog + 4 725c380fe99b + 1 7c3bad9141dc + 0 1f0dee641bb7 + $ qlog -r 'obsolete()' --hidden + 2 4538525df7e2 + 3 0d3f46688ccc $ hg up 3 -q $ mkcommit d # 5 (on 3) - $ hg log -r 'obsolete()' - changeset: 3:0d3f46688ccc - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c - + $ qlog -r 'obsolete()' + 3 0d3f46688ccc Test communication of obsolete relation with a compatible client @@ -129,55 +65,26 @@ adding manifests adding file changes added 6 changesets with 6 changes to 6 files (+2 heads) - $ hg -R ../other-new log -r 'obsolete()' - changeset: 3:0d3f46688ccc - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c - - $ hg -R ../other-new log - changeset: 5:a7a6f2b5d8a5 - tag: tip - parent: 3:0d3f46688ccc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add d - - changeset: 4:725c380fe99b - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c' - - changeset: 3:0d3f46688ccc - parent: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add obsol_c - - changeset: 1:7c3bad9141dc - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add b - - changeset: 0:1f0dee641bb7 - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add a - + $ qlog -R ../other-new -r 'obsolete()' + 3 0d3f46688ccc + $ qlog -R ../other-new + 5 a7a6f2b5d8a5 + 4 725c380fe99b + 3 0d3f46688ccc + 1 7c3bad9141dc + 0 1f0dee641bb7 $ hg up 3 -q $ mkcommit obsol_d # 6 created new head $ hg debugobsolete 6 5 $ qlog - 6 - 4 - 3 - 1 - 0 + 6 95de7fc6918d + 4 725c380fe99b + 3 0d3f46688ccc + 1 7c3bad9141dc + 0 1f0dee641bb7 $ qlog -r 'obsolete()' - 3 + 3 0d3f46688ccc $ hg push ../other-new -f # XXX should not have to use -f pushing to ../other-new searching for changes @@ -186,13 +93,13 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) $ qlog -R ../other-new - 6 - 4 - 3 - 1 - 0 + 6 95de7fc6918d + 4 725c380fe99b + 3 0d3f46688ccc + 1 7c3bad9141dc + 0 1f0dee641bb7 $ qlog -R ../other-new -r 'obsolete()' - 3 + 3 0d3f46688ccc $ hg up -q .^ $ mkcommit "obsol_d'" # 7 created new head @@ -206,11 +113,11 @@ added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads .' to see heads, 'hg merge' to merge) $ qlog -R ../other-new - 7 - 4 - 3 - 1 - 0 + 7 909a0fb57e5d + 4 725c380fe99b + 3 0d3f46688ccc + 1 7c3bad9141dc + 0 1f0dee641bb7