Mercurial > evolve
changeset 1195:af9fd422adbb
tests: update to new core output
Multiple output change need to be applied to the test suite.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 30 Jan 2015 19:01:23 +0000 |
| parents | de73285cf504 |
| children | 9e3f332f7630 |
| files | tests/test-drop.t tests/test-evolve.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-userguide.t |
| diffstat | 5 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-drop.t Wed Jan 07 15:24:47 2015 -0800 +++ b/tests/test-drop.t Fri Jan 30 19:01:23 2015 +0000 @@ -62,7 +62,7 @@ 0 obsmarkers found search nodes: wall * comb * user * sys * (glob) 1 nodes found - saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg (glob) + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-8ad8efe0-drophack.hg (glob) strip nodes: wall * comb * user * sys * (glob) $ summary ============ graph ==============
--- a/tests/test-evolve.t Wed Jan 07 15:24:47 2015 -0800 +++ b/tests/test-evolve.t Fri Jan 30 19:01:23 2015 +0000 @@ -446,7 +446,7 @@ abort: empty revision set [255] $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' - saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg (glob) + saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob) $ hg verify checking changesets checking manifests
--- a/tests/test-stabilize-order.t Wed Jan 07 15:24:47 2015 -0800 +++ b/tests/test-stabilize-order.t Fri Jan 30 19:01:23 2015 +0000 @@ -69,7 +69,10 @@ hg rebase -r 22619daeed78 -d 005fe5914f78 resolving manifests getting b + committing files: b + committing manifest + committing changelog working directory is now at bede829dd2d3 $ glog @ 8:bede829dd2d3@default(draft) addb @@ -98,7 +101,10 @@ getting b resolving manifests getting c + committing files: c + committing manifest + committing changelog working directory is now at 65095d7d0dd5 $ hg debugobsolete > successors.new $ diff -u successors.old successors.new @@ -159,7 +165,10 @@ getting b resolving manifests getting c + committing files: c + committing manifest + committing changelog working directory is now at e99ecf51c867 $ glog @ 12:e99ecf51c867@default(draft) addc
--- a/tests/test-stabilize-result.t Wed Jan 07 15:24:47 2015 -0800 +++ b/tests/test-stabilize-result.t Fri Jan 30 19:01:23 2015 +0000 @@ -93,7 +93,7 @@ +newer a $ hg evolve --continue grafting 5:3655f0f50885 "newer a" - abort: unresolved merge conflicts (see hg help resolve) + abort: unresolved merge conflicts (see "hg help resolve") [255] $ hg resolve -m a (no more unresolved files) @@ -256,9 +256,15 @@ merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved amending changeset eacc9c8240fe + committing files: a + committing manifest + committing changelog copying changeset 283ccd10e2b8 to 7bc2f5967f5e + committing files: a + committing manifest + committing changelog committed changeset 21:f344982e63c4 working directory is now at f344982e63c4 $ hg st
--- a/tests/test-userguide.t Wed Jan 07 15:24:47 2015 -0800 +++ b/tests/test-userguide.t Fri Jan 30 19:01:23 2015 +0000 @@ -18,7 +18,7 @@ example 2: unsafe amend with plain vanilla Mercurial: the original commit is stripped $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y' - saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-amend-backup.hg (glob) + saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend-backup.hg (glob) $ hg log -r 23fe4ac6d3f1 abort: unknown revision '23fe4ac6d3f1'! [255]