##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.
Patrick Mezard - - Load All Authors

File last commit:

r6639:6334569c default
r8165:78658990 default
Show More
test-transplant
116 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-transplant
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
Add transplant extension
 r3714 #!/bin/sh
cat <<EOF >> $HGRCPATH
[extensions]
transplant=
EOF
hg init t
cd t
echo r1 > r1
hg ci -Amr1 -d'0 0'
echo r2 > r2
hg ci -Amr2 -d'1 0'
hg up 0
echo b1 > b1
hg ci -Amb1 -d '0 0'
echo b2 > b2
hg ci -Amb2 -d '1 0'
echo b3 > b3
hg ci -Amb3 -d '2 0'
hg log --template '{rev} {parents} {desc}\n'
Brendan Cully
Minor test-transplant cleanup
 r4034 hg clone . ../rebase
cd ../rebase
Brendan Cully
Add transplant extension
 r3714
hg up -C 1
echo '% rebase b onto r1'
hg transplant -a -b tip
hg log --template '{rev} {parents} {desc}\n'
Brendan Cully
Minor test-transplant cleanup
 r4034 hg clone ../t ../prune
cd ../prune
Brendan Cully
Add transplant extension
 r3714
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'
echo '% remote transplant'
Brendan Cully
Minor test-transplant cleanup
 r4034 hg clone -r 1 ../t ../remote
cd ../remote
Brendan Cully
Add transplant extension
 r3714 hg transplant --log -s ../t 2 4
hg log --template '{rev} {parents} {desc}\n'
echo '% skip previous transplants'
hg transplant -s ../t -a -b 4
hg log --template '{rev} {parents} {desc}\n'
echo '% skip local changes transplanted to the source'
echo b4 > b4
hg ci -Amb4 -d '3 0'
Brendan Cully
Minor test-transplant cleanup
 r4034 hg clone ../t ../pullback
cd ../pullback
Brendan Cully
Add transplant extension
 r3714 hg transplant -s ../remote -a -b tip
Brendan Cully
transplant: fix --continue; add --continue test
 r3724
Brendan Cully
Make test-transplant test pull case
 r4036 echo '% remote transplant with pull'
Bryan O'Sullivan
Allow tests to run in parallel.
 r5384 hg -R ../t serve -p $HGPORT -d --pid-file=../t.pid
Brendan Cully
transplant: test non-local source
 r4050 cat ../t.pid >> $DAEMON_PIDS
Brendan Cully
Make test-transplant test pull case
 r4036 hg clone -r 0 ../t ../rp
cd ../rp
Bryan O'Sullivan
Allow tests to run in parallel.
 r5384 hg transplant -s http://localhost:$HGPORT/ 2 4
Brendan Cully
Make test-transplant test pull case
 r4036 hg log --template '{rev} {parents} {desc}\n'
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 echo '% transplant --continue'
hg init ../tc
cd ../tc
cat <<EOF > foo
foo
bar
baz
EOF
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 echo toremove > toremove
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 hg ci -Amfoo -d '0 0'
cat <<EOF > foo
foo2
bar2
baz2
EOF
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 rm toremove
echo added > added
hg ci -Amfoo2 -d '0 0'
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 echo bar > bar
hg ci -Ambar -d '0 0'
echo bar2 >> bar
hg ci -mbar2 -d '0 0'
hg up 0
echo foobar > foo
hg ci -mfoobar -d '0 0'
hg transplant 1:3
Brendan Cully
transplant: log source node when recovering too.
 r3758 # transplant -c shouldn't use an old changeset
hg up -C
hg transplant 1
Brendan Cully
transplant: fix --continue; add --continue test
 r3724 hg transplant --continue
Brendan Cully
transplant: log source node when recovering too.
 r3758 hg transplant 1:3
Brendan Cully
transplant: recover added/removed files after failed application
 r3726 hg locate
Patrick Mezard
localrepo: fix partial merge test (issue 1111)
 r6639 cd ..
# Test transplant --merge (issue 1111)
echo % test transplant merge
hg init t1111
cd t1111
echo a > a
hg ci -Am adda
echo b >> a
hg ci -m appendb
echo c >> a
hg ci -m appendc
hg up -C 0
echo d >> a
hg ci -m appendd
echo % tranplant
hg transplant -m 1
cd ..