Mercurial > hg
changeset 11977:db2a291e25e9
tests: unify test-merge4
| author | Pradeepkumar Gayam <in3xes@gmail.com> |
|---|---|
| date | Wed, 18 Aug 2010 05:12:44 +0530 |
| parents | b28fc3b3efd6 |
| children | ef4a1ffbf519 |
| files | tests/test-merge4 tests/test-merge4.out tests/test-merge4.t |
| diffstat | 3 files changed, 20 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge4 Wed Aug 18 05:09:58 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -#!/bin/sh - -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" -hg merge 1 -rm b -echo This is file c22 > c -hg commit -m "commit #3" -d "1000000 0"
--- a/tests/test-merge4.out Wed Aug 18 05:09:58 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -created new head -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge4.t Wed Aug 18 05:12:44 2010 +0530 @@ -0,0 +1,20 @@ + $ 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 + $ hg merge 1 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ rm b + $ echo This is file c22 > c + $ hg commit -m "commit #3" -d "1000000 0" +