Mercurial > hg
changeset 11846:650402ea4a4f
tests: unify test-586
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Aug 2010 01:58:04 +0200 |
parents | d59a623cc4c9 |
children | 1eb77c1a281f |
files | tests/test-586 tests/test-586.out tests/test-586.t |
diffstat | 3 files changed, 87 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-586 Fri Aug 13 15:18:15 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -#!/bin/sh -# a test for issue586 - -hg init a -cd a -echo a > a -hg ci -Ama - -hg init ../b -cd ../b -echo b > b -hg ci -Amb - -hg pull -f ../a -hg merge -hg rm -f a -hg ci -Amc - -hg st -A -cd .. - -# a test for issue 1433, related to issue586 -echo % create test repos -hg init repoa -touch repoa/a -hg -R repoa ci -Am adda - -hg init repob -touch repob/b -hg -R repob ci -Am addb - -hg init repoc -cd repoc -hg pull ../repoa -hg update -mkdir tst -hg mv * tst -hg ci -m "import a in tst" -hg pull -f ../repob -echo % merge both repos -hg merge -mkdir src -echo % move b content -hg mv b src -hg ci -m "import b in src" -hg manifest - - -
--- a/tests/test-586.out Fri Aug 13 15:18:15 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -adding a -adding b -pulling from ../a -searching for changes -warning: repository is unrelated -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) -C b -% create test repos -adding a -adding b -pulling from ../repoa -requesting all changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -(run 'hg update' to get a working copy) -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -pulling from ../repob -searching for changes -warning: repository is unrelated -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) -% merge both repos -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit) -% move b content -src/b -tst/a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-586.t Sat Aug 14 01:58:04 2010 +0200 @@ -0,0 +1,87 @@ +a test for issue586 + + $ hg init a + $ cd a + $ echo a > a + $ hg ci -Ama + adding a + + $ hg init ../b + $ cd ../b + $ echo b > b + $ hg ci -Amb + adding b + + $ hg pull -f ../a + pulling from ../a + searching for changes + warning: repository is unrelated + 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 rm -f a + $ hg ci -Amc + + $ hg st -A + C b + $ cd .. + +a test for issue 1433, related to issue586 + +create test repos + + $ hg init repoa + $ touch repoa/a + $ hg -R repoa ci -Am adda + adding a + + $ hg init repob + $ touch repob/b + $ hg -R repob ci -Am addb + adding b + + $ hg init repoc + $ cd repoc + $ hg pull ../repoa + pulling from ../repoa + requesting all changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + (run 'hg update' to get a working copy) + $ hg update + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ mkdir tst + $ hg mv * tst + $ hg ci -m "import a in tst" + $ hg pull -f ../repob + pulling from ../repob + searching for changes + warning: repository is unrelated + 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) + +merge both repos + + $ hg merge + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ mkdir src + +move b content + + $ hg mv b src + $ hg ci -m "import b in src" + $ hg manifest + src/b + tst/a +