Mercurial > hg
changeset 11979:39fb1e4c079f
tests: unify test-merge6
| author | Pradeepkumar Gayam <in3xes@gmail.com> |
|---|---|
| date | Wed, 18 Aug 2010 05:21:07 +0530 |
| parents | ef4a1ffbf519 |
| children | c443e95d295b |
| files | tests/test-merge6 tests/test-merge6.out tests/test-merge6.t |
| diffstat | 3 files changed, 69 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge6 Wed Aug 18 05:15:49 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -#!/bin/sh - -cat <<EOF > merge -import sys, os -print "merging for", os.path.basename(sys.argv[1]) -EOF -HGMERGE="python ../merge"; export HGMERGE - -mkdir A1 -cd A1 -hg init -echo This is file foo1 > foo -echo This is file bar1 > bar -hg add foo bar -hg commit -m "commit text" -d "1000000 0" - -cd .. -hg clone A1 B1 - -cd A1 -rm bar -hg remove bar -hg commit -m "commit test" -d "1000000 0" - -cd ../B1 -echo This is file foo22 > foo -hg commit -m "commit test" -d "1000000 0" - -cd .. -hg clone A1 A2 -hg clone B1 B2 - -cd A1 -hg pull ../B1 -hg merge -hg commit -m "commit test" -d "1000000 0" -echo bar should remain deleted. -hg manifest --debug - -cd ../B2 -hg pull ../A2 -hg merge -hg commit -m "commit test" -d "1000000 0" -echo bar should remain deleted. -hg manifest --debug
--- a/tests/test-merge6.out Wed Aug 18 05:15:49 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -updating to branch default -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating to branch default -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from ../B1 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files (+1 heads) -(run 'hg heads' to see heads, 'hg merge' to merge) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -bar should remain deleted. -f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo -pulling from ../A2 -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 0 changes to 0 files (+1 heads) -(run 'hg heads' to see heads, 'hg merge' to merge) -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -(branch merge, don't forget to commit) -bar should remain deleted. -f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge6.t Wed Aug 18 05:21:07 2010 +0530 @@ -0,0 +1,69 @@ + $ cat <<EOF > merge + > import sys, os + > print "merging for", os.path.basename(sys.argv[1]) + > EOF + $ HGMERGE="python ../merge"; export HGMERGE + + $ mkdir A1 + $ cd A1 + $ hg init + $ echo This is file foo1 > foo + $ echo This is file bar1 > bar + $ hg add foo bar + $ hg commit -m "commit text" -d "1000000 0" + + $ cd .. + $ hg clone A1 B1 + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ cd A1 + $ rm bar + $ hg remove bar + $ hg commit -m "commit test" -d "1000000 0" + + $ cd ../B1 + $ echo This is file foo22 > foo + $ hg commit -m "commit test" -d "1000000 0" + + $ cd .. + $ hg clone A1 A2 + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg clone B1 B2 + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ cd A1 + $ hg pull ../B1 + pulling from ../B1 + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hg merge + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg commit -m "commit test" -d "1000000 0" +bar should remain deleted. + $ hg manifest --debug + f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo + + $ cd ../B2 + $ hg pull ../A2 + pulling from ../A2 + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 0 changes to 0 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hg merge + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ hg commit -m "commit test" -d "1000000 0" +bar should remain deleted. + $ hg manifest --debug + f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo