equal
deleted
inserted
replaced
54 hg clone ../t ../pullback |
54 hg clone ../t ../pullback |
55 cd ../pullback |
55 cd ../pullback |
56 hg transplant -s ../remote -a -b tip |
56 hg transplant -s ../remote -a -b tip |
57 |
57 |
58 echo '% remote transplant with pull' |
58 echo '% remote transplant with pull' |
59 hg -R ../t serve -p 20062 -d --pid-file=../t.pid |
59 hg -R ../t serve -p $HGPORT -d --pid-file=../t.pid |
60 cat ../t.pid >> $DAEMON_PIDS |
60 cat ../t.pid >> $DAEMON_PIDS |
61 |
61 |
62 hg clone -r 0 ../t ../rp |
62 hg clone -r 0 ../t ../rp |
63 cd ../rp |
63 cd ../rp |
64 hg transplant -s http://localhost:20062/ 2 4 |
64 hg transplant -s http://localhost:$HGPORT/ 2 4 |
65 hg log --template '{rev} {parents} {desc}\n' |
65 hg log --template '{rev} {parents} {desc}\n' |
66 |
66 |
67 echo '% transplant --continue' |
67 echo '% transplant --continue' |
68 hg init ../tc |
68 hg init ../tc |
69 cd ../tc |
69 cd ../tc |