Mercurial > hg-stable
changeset 4036:ebf1a05f6479
Make test-transplant test pull case
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 16 Jan 2007 12:52:03 -0800 |
| parents | c8f26bd24e86 |
| children | bbdba01cce28 |
| files | tests/test-transplant tests/test-transplant.out |
| diffstat | 2 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-transplant Tue Jan 16 12:51:02 2007 -0800 +++ b/tests/test-transplant Tue Jan 16 12:52:03 2007 -0800 @@ -55,6 +55,12 @@ cd ../pullback hg transplant -s ../remote -a -b tip +echo '% remote transplant with pull' +hg clone -r 0 ../t ../rp +cd ../rp +hg transplant -s ../t 2 4 +hg log --template '{rev} {parents} {desc}\n' + echo '% transplant --continue' hg init ../tc cd ../tc
--- a/tests/test-transplant.out Tue Jan 16 12:51:02 2007 -0800 +++ b/tests/test-transplant.out Tue Jan 16 12:52:03 2007 -0800 @@ -75,6 +75,24 @@ searching for changes applying 4333daefcb15 4333daefcb15 transplanted to 5f42c04e07cc +% remote transplant with pull +requesting all changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +searching for changes +searching for changes +adding changesets +adding manifests +adding file changes +added 1 changesets with 1 changes to 1 files +applying a53251cdf717 +a53251cdf717 transplanted to 8d9279348abb +2 b3 +1 b1 +0 r1 % transplant --continue adding foo adding toremove