# HG changeset patch # User Brendan Cully # Date 1168980723 28800 # Node ID ebf1a05f647906f2b262be05c5c983fcc3bf77f2 # Parent c8f26bd24e8652f6dc66680dfc51187e335b5408 Make test-transplant test pull case diff --git a/tests/test-transplant b/tests/test-transplant --- a/tests/test-transplant +++ b/tests/test-transplant @@ -55,6 +55,12 @@ hg clone ../t ../pullback 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 diff --git a/tests/test-transplant.out b/tests/test-transplant.out --- a/tests/test-transplant.out +++ b/tests/test-transplant.out @@ -75,6 +75,24 @@ 4 files updated, 0 files merged, 0 files 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