Mercurial > hg
changeset 4034:9bd078ce8de9
Minor test-transplant cleanup
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Tue, 16 Jan 2007 12:38:26 -0800 |
| parents | 84e469ce6408 |
| children | c8f26bd24e86 |
| files | tests/test-transplant |
| diffstat | 1 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-transplant Mon Jan 15 22:46:03 2007 +0100 +++ b/tests/test-transplant Tue Jan 16 12:38:26 2007 -0800 @@ -22,28 +22,25 @@ hg log --template '{rev} {parents} {desc}\n' -cd .. -hg clone t rebase -cd rebase +hg clone . ../rebase +cd ../rebase hg up -C 1 echo '% rebase b onto r1' hg transplant -a -b tip hg log --template '{rev} {parents} {desc}\n' -cd .. -hg clone t prune -cd prune +hg clone ../t ../prune +cd ../prune hg up -C 1 echo '% rebase b onto r1, skipping b2' hg transplant -a -b tip -p 3 hg log --template '{rev} {parents} {desc}\n' -cd .. echo '% remote transplant' -hg clone -r 1 t remote -cd remote +hg clone -r 1 ../t ../remote +cd ../remote hg transplant --log -s ../t 2 4 hg log --template '{rev} {parents} {desc}\n' @@ -54,9 +51,8 @@ echo '% skip local changes transplanted to the source' echo b4 > b4 hg ci -Amb4 -d '3 0' -cd .. -hg clone t pullback -cd pullback +hg clone ../t ../pullback +cd ../pullback hg transplant -s ../remote -a -b tip echo '% transplant --continue'