Mercurial > hg
changeset 11975:21884b433c51
tests: unify test-merge1
| author | Pradeepkumar Gayam <in3xes@gmail.com> |
|---|---|
| date | Wed, 18 Aug 2010 05:05:51 +0530 |
| parents | ccd581c66284 |
| children | b28fc3b3efd6 |
| files | tests/test-merge1 tests/test-merge1.out tests/test-merge1.t |
| diffstat | 3 files changed, 165 insertions(+), 176 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge1 Wed Aug 18 04:37:06 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +0,0 @@ -#!/bin/sh - -cat <<EOF > merge -import sys, os - -try: - import msvcrt - msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) - msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) -except ImportError: - pass - -print "merging for", os.path.basename(sys.argv[1]) -EOF -HGMERGE="python ../merge"; export HGMERGE - -mkdir t -cd t -hg init -echo This is file a1 > a -hg add a -hg commit -m "commit #0" -d "1000000 0" -echo This is file b1 > b -hg add b -hg commit -m "commit #1" -d "1000000 0" - -hg update 0 -echo This is file c1 > c -hg add c -hg commit -m "commit #2" -d "1000000 0" -echo This is file b1 > b -echo %% no merges expected -hg merge -P 1 -hg merge 1 -hg diff --nodates -hg status -cd ..; rm -r t - -mkdir t -cd t -hg init -echo This is file a1 > a -hg add a -hg commit -m "commit #0" -d "1000000 0" -echo This is file b1 > b -hg add b -hg commit -m "commit #1" -d "1000000 0" - -hg update 0 -echo This is file c1 > c -hg add c -hg commit -m "commit #2" -d "1000000 0" -echo This is file b2 > b -echo %% merge should fail -hg merge 1 -echo %% merge of b expected -hg merge -f 1 -hg diff --nodates -hg status -cd ..; rm -r t -echo %% - -mkdir t -cd t -hg init -echo This is file a1 > a -hg add a -hg commit -m "commit #0" -d "1000000 0" -echo This is file b1 > b -hg add b -hg commit -m "commit #1" -d "1000000 0" -echo This is file b22 > b -hg commit -m "commit #2" -d "1000000 0" -hg update 1 -echo This is file c1 > c -hg add c -hg commit -m "commit #3" -d "1000000 0" - -echo 'Contents of b should be "this is file b1"' -cat b - -echo This is file b22 > b -echo %% merge fails -hg merge 2 -echo %% merge expected! -hg merge -f 2 -hg diff --nodates -hg status -cd ..; rm -r t - -mkdir t -cd t -hg init -echo This is file a1 > a -hg add a -hg commit -m "commit #0" -d "1000000 0" -echo This is file b1 > b -hg add b -hg commit -m "commit #1" -d "1000000 0" -echo This is file b22 > b -hg commit -m "commit #2" -d "1000000 0" -hg update 1 -echo This is file c1 > c -hg add c -hg commit -m "commit #3" -d "1000000 0" -echo This is file b33 > b -echo %% merge of b should fail -hg merge 2 -echo %% merge of b expected -hg merge -f 2 -hg diff --nodates -hg status
--- a/tests/test-merge1.out Wed Aug 18 04:37:06 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -created new head -%% no merges expected -changeset: 1:4ee19afe4659 -user: test -date: Mon Jan 12 13:46:40 1970 +0000 -summary: commit #1 - -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -diff -r d9e5953b9dec b ---- /dev/null -+++ b/b -@@ -0,0 +1,1 @@ -+This is file b1 -M b -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -created new head -%% merge should fail -abort: untracked file in working directory differs from file in requested revision: 'b' -%% merge of b expected -merging for b -merging b -0 files updated, 1 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -diff -r d9e5953b9dec b ---- /dev/null -+++ b/b -@@ -0,0 +1,1 @@ -+This is file b2 -M b -%% -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -created new head -Contents of b should be "this is file b1" -This is file b1 -%% merge fails -abort: outstanding uncommitted changes (use 'hg status' to list changes) -%% merge expected! -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -diff -r c1dd73cbf59f b ---- a/b -+++ b/b -@@ -1,1 +1,1 @@ --This is file b1 -+This is file b22 -M b -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -created new head -%% merge of b should fail -abort: outstanding uncommitted changes (use 'hg status' to list changes) -%% merge of b expected -merging for b -merging b -0 files updated, 1 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -diff -r c1dd73cbf59f b ---- a/b -+++ b/b -@@ -1,1 +1,1 @@ --This is file b1 -+This is file b33 -M b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge1.t Wed Aug 18 05:05:51 2010 +0530 @@ -0,0 +1,165 @@ + $ cat <<EOF > merge + > import sys, os + > + > try: + > import msvcrt + > msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) + > msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) + > except ImportError: + > pass + > + > print "merging for", os.path.basename(sys.argv[1]) + > EOF + $ HGMERGE="python ../merge"; export HGMERGE + + $ mkdir t + $ cd t + $ hg init + $ echo This is file a1 > a + $ hg add a + $ hg commit -m "commit #0" -d "1000000 0" + $ echo This is file b1 > b + $ hg add b + $ hg commit -m "commit #1" -d "1000000 0" + + $ hg update 0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ echo This is file c1 > c + $ hg add c + $ hg commit -m "commit #2" -d "1000000 0" + created new head + $ echo This is file b1 > b +no merges expected + $ hg merge -P 1 + changeset: 1:4ee19afe4659 + user: test + date: Mon Jan 12 13:46:40 1970 +0000 + summary: commit #1 + + $ hg merge 1 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg diff --nodates + diff -r d9e5953b9dec b + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +This is file b1 + $ hg status + M b + $ cd ..; rm -r t + + $ mkdir t + $ cd t + $ hg init + $ echo This is file a1 > a + $ hg add a + $ hg commit -m "commit #0" -d "1000000 0" + $ echo This is file b1 > b + $ hg add b + $ hg commit -m "commit #1" -d "1000000 0" + + $ hg update 0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ echo This is file c1 > c + $ hg add c + $ hg commit -m "commit #2" -d "1000000 0" + created new head + $ echo This is file b2 > b +merge should fail + $ hg merge 1 + abort: untracked file in working directory differs from file in requested revision: 'b' +merge of b expected + $ hg merge -f 1 + merging for b + merging b + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg diff --nodates + diff -r d9e5953b9dec b + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +This is file b2 + $ hg status + M b + $ cd ..; rm -r t + + $ mkdir t + $ cd t + $ hg init + $ echo This is file a1 > a + $ hg add a + $ hg commit -m "commit #0" -d "1000000 0" + $ echo This is file b1 > b + $ hg add b + $ hg commit -m "commit #1" -d "1000000 0" + $ echo This is file b22 > b + $ hg commit -m "commit #2" -d "1000000 0" + $ hg update 1 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo This is file c1 > c + $ hg add c + $ hg commit -m "commit #3" -d "1000000 0" + created new head + +Contents of b should be "this is file b1" + $ cat b + This is file b1 + + $ echo This is file b22 > b +merge fails + $ hg merge 2 + abort: outstanding uncommitted changes (use 'hg status' to list changes) + $ echo %% merge expected! + %% merge expected! + $ hg merge -f 2 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg diff --nodates + diff -r c1dd73cbf59f b + --- a/b + +++ b/b + @@ -1,1 +1,1 @@ + -This is file b1 + +This is file b22 + $ hg status + M b + $ cd ..; rm -r t + + $ mkdir t + $ cd t + $ hg init + $ echo This is file a1 > a + $ hg add a + $ hg commit -m "commit #0" -d "1000000 0" + $ echo This is file b1 > b + $ hg add b + $ hg commit -m "commit #1" -d "1000000 0" + $ echo This is file b22 > b + $ hg commit -m "commit #2" -d "1000000 0" + $ hg update 1 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo This is file c1 > c + $ hg add c + $ hg commit -m "commit #3" -d "1000000 0" + created new head + $ echo This is file b33 > b +merge of b should fail + $ hg merge 2 + abort: outstanding uncommitted changes (use 'hg status' to list changes) +merge of b expected + $ hg merge -f 2 + merging for b + merging b + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg diff --nodates + diff -r c1dd73cbf59f b + --- a/b + +++ b/b + @@ -1,1 +1,1 @@ + -This is file b1 + +This is file b33 + $ hg status + M b