# HG changeset patch # User Matt Mackall # Date 2010-05-14 15:01:09 # Node ID 39e7f14a828666c2ca2e4560b4a41896a7692326 # Parent ba78a1bfbfd9fbe0fa48a05b8d94e6dcf431f635 rollback: fix up tests diff --git a/tests/test-acl.out b/tests/test-acl.out --- a/tests/test-acl.out +++ b/tests/test-acl.out @@ -71,7 +71,7 @@ adding quux/file.py revisions files: 3/3 chunks (100.00%) added 3 changesets with 3 changes to 3 files updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 Extension disabled for lack of acl.sources @@ -143,7 +143,7 @@ added 3 changesets with 3 changes to 3 f calling hook pretxnchangegroup.acl: hgext.acl.hook acl: changes have source "push" - skipping updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 No [acl.allow]/[acl.deny] @@ -226,7 +226,7 @@ acl: allowing changeset f9cafe1212c8 acl: branch access granted: "911600dab2ae" on branch "default" acl: allowing changeset 911600dab2ae updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 Empty [acl.allow] @@ -832,7 +832,7 @@ acl: allowing changeset f9cafe1212c8 acl: branch access granted: "911600dab2ae" on branch "default" acl: allowing changeset 911600dab2ae updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 wilma can change files with a .txt extension @@ -1208,7 +1208,7 @@ acl: allowing changeset f9cafe1212c8 acl: branch access granted: "911600dab2ae" on branch "default" acl: allowing changeset 911600dab2ae updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 asterisk test @@ -1293,7 +1293,7 @@ acl: allowing changeset f9cafe1212c8 acl: branch access granted: "911600dab2ae" on branch "default" acl: allowing changeset 911600dab2ae updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 no one is allowed inside foo/Bar/ @@ -1465,7 +1465,7 @@ acl: allowing changeset f9cafe1212c8 acl: branch access granted: "911600dab2ae" on branch "default" acl: allowing changeset 911600dab2ae updating the branch cache -rolling back to revision 1 (undo push) +rolling back to revision 0 (undo push) 0:6675d58eff77 @group is allowed inside anything but foo/Bar/ diff --git a/tests/test-backout.out b/tests/test-backout.out --- a/tests/test-backout.out +++ b/tests/test-backout.out @@ -62,7 +62,7 @@ abort: cannot use --parent on non-merge # backout with valid parent should be ok removing d changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e -rolling back to revision 5 (undo commit) +rolling back to revision 4 (undo commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing c changeset 5:033590168430 backs out changeset 4:b2f3bb92043e diff --git a/tests/test-bundle-r.out b/tests/test-bundle-r.out --- a/tests/test-bundle-r.out +++ b/tests/test-bundle-r.out @@ -154,7 +154,7 @@ checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions -rolling back to revision 5 (undo pull) +rolling back to revision 4 (undo pull) % should fail abort: --base is incompatible with specifying a destination abort: repository default-push not found! @@ -187,7 +187,7 @@ checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions -rolling back to revision 3 (undo unbundle) +rolling back to revision 2 (undo unbundle) % 2 2:d62976ca1e50 adding changesets @@ -202,7 +202,7 @@ checking manifests crosschecking files in changesets and manifests checking files 2 files, 5 changesets, 5 total revisions -rolling back to revision 3 (undo unbundle) +rolling back to revision 2 (undo unbundle) adding changesets adding manifests adding file changes @@ -215,7 +215,7 @@ checking manifests crosschecking files in changesets and manifests checking files 3 files, 7 changesets, 6 total revisions -rolling back to revision 3 (undo unbundle) +rolling back to revision 2 (undo unbundle) adding changesets adding manifests adding file changes diff --git a/tests/test-bundle.out b/tests/test-bundle.out --- a/tests/test-bundle.out +++ b/tests/test-bundle.out @@ -37,7 +37,7 @@ adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) ====== Rollback empty -rolling back to revision 0 (undo pull) +rolling back to revision -1 (undo pull) ====== Pull full.hg into empty again (using --cwd) pulling from ../full.hg requesting all changes @@ -55,7 +55,7 @@ pulling from full.hg searching for changes no changes found ====== Rollback empty -rolling back to revision 0 (undo pull) +rolling back to revision -1 (undo pull) ====== Pull full.hg into empty again (using -R) pulling from full.hg requesting all changes @@ -123,7 +123,7 @@ adding file changes added 9 changesets with 7 changes to 4 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) ====== Rollback empty -rolling back to revision 0 (undo pull) +rolling back to revision -1 (undo pull) ====== Log -R bundle:empty+full.hg 8 7 6 5 4 3 2 1 0 ====== Pull full.hg into empty again (using -R; with hook) diff --git a/tests/test-convert-cvs.out b/tests/test-convert-cvs.out --- a/tests/test-convert-cvs.out +++ b/tests/test-convert-cvs.out @@ -45,7 +45,7 @@ converting... 2 Initial revision 1 import filtering out empty revision -rolling back to revision 1 (undo commit) +rolling back to revision 0 (undo commit) 0 ci0 updating tags c diff --git a/tests/test-diff-color.out b/tests/test-diff-color.out --- a/tests/test-diff-color.out +++ b/tests/test-diff-color.out @@ -43,7 +43,7 @@ examine changes to 'a'? [Ynsfdaq?] c record this change to 'a'? [Ynsfdaq?] -rolling back to revision 1 (undo commit) +rolling back to revision 0 (undo commit) % qrecord diff --git a/a b/a old mode 100644 diff --git a/tests/test-hook.out b/tests/test-hook.out --- a/tests/test-hook.out +++ b/tests/test-hook.out @@ -101,7 +101,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) -rolling back to revision 4 (undo pull) +rolling back to revision 3 (undo pull) preoutgoing hook: HG_SOURCE=pull preoutgoing.forbid hook: HG_SOURCE=pull pulling from ../a diff --git a/tests/test-import.out b/tests/test-import.out --- a/tests/test-import.out +++ b/tests/test-import.out @@ -182,7 +182,7 @@ parent: 0 applying ../patch1 applying ../patch2 applied 1d4bd90af0e4 -rolling back to revision 2 (undo commit) +rolling back to revision 1 (undo commit) parent: 1 % hg import in a subdirectory requesting all changes diff --git a/tests/test-keyword.out b/tests/test-keyword.out --- a/tests/test-keyword.out +++ b/tests/test-keyword.out @@ -163,7 +163,7 @@ diff -r d17e03c92c97 a do not process $Id: xxx $ +bar -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % init --mq % qimport @@ -237,7 +237,7 @@ diff -r ef63ca68695b c +do not process $Id: +xxx $ % rollback -rolling back to revision 2 (undo commit) +rolling back to revision 1 (undo commit) % status A c % update -C @@ -305,7 +305,7 @@ committed changeset 3:d14c712653769de926 % status ? c % rollback -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) % status R a ? c @@ -347,7 +347,7 @@ xxx $ ignore $Id$ % rollback -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) % clean update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % kwexpand/kwshrink on selected files diff --git a/tests/test-newbranch.out b/tests/test-newbranch.out --- a/tests/test-newbranch.out +++ b/tests/test-newbranch.out @@ -63,7 +63,7 @@ foo default bar % test for invalid branch cache -rolling back to revision 5 (undo commit) +rolling back to revision 4 (undo commit) changeset: 4:4909a3732169 branch: foo tag: tip diff --git a/tests/test-notify.out b/tests/test-notify.out --- a/tests/test-notify.out +++ b/tests/test-notify.out @@ -95,10 +95,10 @@ diff -r cb9a9f314b8b -r 0647d048b600 a +a (run 'hg update' to get a working copy) % fail for config file is missing -rolling back to revision 1 (undo pull) +rolling back to revision 0 (undo pull) pull failed % pull -rolling back to revision 1 (undo pull) +rolling back to revision 0 (undo pull) pulling from ../a searching for changes adding changesets @@ -129,7 +129,7 @@ diff -r cb9a9f314b8b -r 0647d048b600 a +a (run 'hg update' to get a working copy) % pull -rolling back to revision 1 (undo pull) +rolling back to revision 0 (undo pull) pulling from ../a searching for changes adding changesets diff --git a/tests/test-pull-r.out b/tests/test-pull-r.out --- a/tests/test-pull-r.out +++ b/tests/test-pull-r.out @@ -19,7 +19,7 @@ summary: add foo abort: unknown revision 'missing'! % pull multiple revisions with update 0:bbd179dfa0a7 -rolling back to revision 0 (undo pull) +rolling back to revision -1 (undo pull) % pull -r 0 changeset: 0:bbd179dfa0a7 tag: tip diff --git a/tests/test-pull.out b/tests/test-pull.out --- a/tests/test-pull.out +++ b/tests/test-pull.out @@ -22,7 +22,7 @@ 2ed2a3912a0b24502043eae84ee4b279c18b90dd pulling from http://foo:***@localhost:$HGPORT/ searching for changes no changes found -rolling back to revision 0 (undo pull: http://foo:***@localhost:$HGPORT/) +rolling back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/) % issue 622 pulling from ../test requesting all changes diff --git a/tests/test-push-http.out b/tests/test-push-http.out --- a/tests/test-push-http.out +++ b/tests/test-push-http.out @@ -25,7 +25,7 @@ remote: adding file changes remote: added 1 changesets with 1 changes to 1 files % serve errors changegroup hook: HG_NODE=ba677d0156c1196c1a699fa53f390dcfc3ce3872 HG_SOURCE=serve HG_URL=remote:http -rolling back to revision 1 (undo serve) +rolling back to revision 0 (undo serve) % expect authorization error: all users denied abort: authorization failed pushing to http://localhost:$HGPORT/ diff --git a/tests/test-rename-after-merge.out b/tests/test-rename-after-merge.out --- a/tests/test-rename-after-merge.out +++ b/tests/test-rename-after-merge.out @@ -34,7 +34,7 @@ 2 files updated, 0 files merged, 0 files (branch merge, don't forget to commit) % commit issue 1476 copies: c2 (c1) -rolling back to revision 3 (undo commit) +rolling back to revision 2 (undo commit) 2 files updated, 0 files merged, 2 files removed, 0 files unresolved % merge heads again 2 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-rollback.out b/tests/test-rollback.out --- a/tests/test-rollback.out +++ b/tests/test-rollback.out @@ -9,7 +9,7 @@ user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: test -rolling back to revision 0 (undo commit) +rolling back to revision -1 (undo commit) checking changesets checking manifests crosschecking files in changesets and manifests @@ -18,14 +18,14 @@ 0 files, 0 changesets, 0 total revisions A a % Test issue 902 marked working directory as branch test -rolling back to revision 0 (undo commit) +rolling back to revision -1 (undo commit) default % Test issue 1635 (commit message saved) .hg/last-message.txt: test2 % Test rollback of hg before issue 902 was fixed marked working directory as branch test -rolling back to revision 0 (undo commit) +rolling back to revision -1 (undo commit) Named branch could not be reset, current branch still is: test test % rollback by pretxncommit saves commit message (issue 1635) diff --git a/tests/test-tags.out b/tests/test-tags.out --- a/tests/test-tags.out +++ b/tests/test-tags.out @@ -111,7 +111,7 @@ date: Thu Jan 01 00:00:00 1970 +0 summary: Removed tag bar % rollback undoes tag operation -rolling back to revision 5 (undo commit) +rolling back to revision 4 (undo commit) tip 4:0c192d7d5e6b bar 1:78391a272241 tip 4:0c192d7d5e6b diff --git a/tests/test-url-rev.out b/tests/test-url-rev.out --- a/tests/test-url-rev.out +++ b/tests/test-url-rev.out @@ -75,7 +75,7 @@ summary: add a % rolling back -rolling back to revision 2 (undo push) +rolling back to revision 1 (undo push) % incoming 2:faba9097cad4 % pull @@ -104,7 +104,7 @@ summary: add a % no new revs, no update 0:1f0dee641bb7 % rollback -rolling back to revision 2 (undo pull) +rolling back to revision 1 (undo pull) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0:1f0dee641bb7 % pull -u takes us back to branch foo @@ -116,7 +116,7 @@ date: Thu Jan 01 00:00:00 1970 +0 summary: new head of branch foo % rollback -rolling back to revision 2 (undo pull) +rolling back to revision 1 (undo pull) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % parents 0:1f0dee641bb7