Mercurial > hg
changeset 12284:f7eb190310ef
tests: unify test-confused-revert
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Tue, 14 Sep 2010 21:26:05 +0200 |
| parents | 850e089eb41c |
| children | 5d9bc49b0b1e |
| files | tests/test-confused-revert tests/test-confused-revert.out tests/test-confused-revert.t |
| diffstat | 3 files changed, 80 insertions(+), 84 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-confused-revert Tue Sep 14 19:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -#!/bin/sh - -hg init -echo foo > a -hg add a -hg commit -m "1" - -echo bar > b -hg add b -hg remove a - -echo "%%% should show a removed and b added" -hg status - -echo "reverting..." -hg revert --all - -echo "%%% should show b unknown and a back to normal" -hg status - -rm b - -hg co -C 0 -echo foo-a > a -hg commit -m "2a" - -hg co -C 0 -echo foo-b > a -hg commit -m "2b" - -HGMERGE=true hg merge 1 - -echo "%%% should show foo-b" -cat a - -echo bar > b -hg add b -rm a -hg remove a - -echo "%%% should show a removed and b added" -hg status - -echo "%%% revert should fail" -hg revert --all - -echo "%%% revert should be ok now" -hg revert -r2 --all - -echo "%%% should show b unknown and a marked modified (merged)" -hg status - -echo "%%% should show foo-b" -cat a -
--- a/tests/test-confused-revert.out Tue Sep 14 19:31:00 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -%%% should show a removed and b added -A b -R a -reverting... -undeleting a -forgetting b -%%% should show b unknown and a back to normal -? b -0 files updated, 0 files merged, 0 files removed, 0 files unresolved -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -created new head -merging a -0 files updated, 1 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -%%% should show foo-b -foo-b -%%% should show a removed and b added -A b -R a -%%% revert should fail -abort: uncommitted merge - please provide a specific revision -%%% revert should be ok now -undeleting a -forgetting b -%%% should show b unknown and a marked modified (merged) -M a -? b -%%% should show foo-b -foo-b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-confused-revert.t Tue Sep 14 21:26:05 2010 +0200 @@ -0,0 +1,80 @@ + $ hg init + $ echo foo > a + $ hg add a + $ hg commit -m "1" + + $ echo bar > b + $ hg add b + $ hg remove a + +Should show a removed and b added: + + $ hg status + A b + R a + + $ hg revert --all + undeleting a + forgetting b + +Should show b unknown and a back to normal: + + $ hg status + ? b + + $ rm b + + $ hg co -C 0 + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo foo-a > a + $ hg commit -m "2a" + + $ hg co -C 0 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo foo-b > a + $ hg commit -m "2b" + created new head + + $ HGMERGE=true hg merge 1 + merging a + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + +Should show foo-b: + + $ cat a + foo-b + + $ echo bar > b + $ hg add b + $ rm a + $ hg remove a + +Should show a removed and b added: + + $ hg status + A b + R a + +Revert should fail: + + $ hg revert --all + abort: uncommitted merge - please provide a specific revision + +Revert should be ok now: + + $ hg revert -r2 --all + undeleting a + forgetting b + +Should show b unknown and a marked modified (merged): + + $ hg status + M a + ? b + +Should show foo-b: + + $ cat a + foo-b +