Mercurial > hg
changeset 12113:d171000cf6f8
tests: unify test-rename-dir-merge2
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Mon, 30 Aug 2010 13:51:27 +0900 |
| parents | d27d5ae576a2 |
| children | 0a6b2e21bc86 |
| files | tests/test-bisect.t tests/test-churn.t tests/test-inherit-mode.t tests/test-remove-new.t tests/test-remove.t tests/test-rename-dir-merge.t tests/test-rename-dir-merge2 tests/test-rename-dir-merge2.out tests/test-rename-dir-merge2.t tests/test-rename.t tests/test-revert-flags.t tests/test-revert-unknown.t tests/test-revert.t tests/test-revset.t tests/test-strict.t |
| diffstat | 3 files changed, 45 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge2 Mon Aug 30 13:49:40 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#!/bin/sh - -mkdir r1 -cd r1 -hg init -mkdir a -echo foo > a/f -hg add a -hg ci -m "a/f == foo" -cd .. - -hg clone r1 r2 -cd r2 -hg mv a b -echo foo1 > b/f -hg ci -m" a -> b, b/f == foo1" -cd .. - -cd r1 -mkdir a/aa -echo bar > a/aa/g -hg add a/aa -hg ci -m "a/aa/g" -hg pull ../r2 - -hg merge - -hg st -C
--- a/tests/test-rename-dir-merge2.out Mon Aug 30 13:49:40 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -adding a/f -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -moving a/f to b/f -adding a/aa/g -pulling from ../r2 -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) -2 files updated, 0 files merged, 1 files removed, 0 files unresolved -(branch merge, don't forget to commit) -M b/f -A b/aa/g - a/aa/g -R a/aa/g -R a/f
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-rename-dir-merge2.t Mon Aug 30 13:51:27 2010 +0900 @@ -0,0 +1,45 @@ + $ mkdir r1 + $ cd r1 + $ hg init + $ mkdir a + $ echo foo > a/f + $ hg add a + adding a/f + $ hg ci -m "a/f == foo" + $ cd .. + + $ hg clone r1 r2 + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd r2 + $ hg mv a b + moving a/f to b/f + $ echo foo1 > b/f + $ hg ci -m" a -> b, b/f == foo1" + $ cd .. + + $ cd r1 + $ mkdir a/aa + $ echo bar > a/aa/g + $ hg add a/aa + adding a/aa/g + $ hg ci -m "a/aa/g" + $ hg pull ../r2 + pulling from ../r2 + 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 + 2 files updated, 0 files merged, 1 files removed, 0 files unresolved + (branch merge, don't forget to commit) + + $ hg st -C + M b/f + A b/aa/g + a/aa/g + R a/aa/g + R a/f