##// END OF EJS Templates
bookmarks: use 'applychanges' for bookmark update...
bookmarks: use 'applychanges' for bookmark update There is still some use of 'deletedivergent' bookmark here. They will be taken care of later. The 'deletedivergent' code needs some rework before fitting in the new world.

File last commit:

r20832:5d57b210 default
r33491:1adcb594 default
Show More
rebase.sh
44 lines | 484 B | application/x-sh | BashLexer
Olle Lundberg
tests: don't hardcode path to bash interpreter...
r20832 #!/usr/bin/env bash
Nicolas Dumazet
tests: introduce a rebase bundle to use with rebase tests...
r14118 hg init rebase
cd rebase
Nicolas Dumazet
tests: upgrade bundles/rebase.hg to support test-rebase-collapse...
r14119 # @ 7: 'H'
# |
# | o 6: 'G'
# |/|
# o | 5: 'F'
# | |
# | o 4: 'E'
# |/
# | o 3: 'D'
# | |
# | o 2: 'C'
# | |
# | o 1: 'B'
# |/
# o 0: 'A'
Nicolas Dumazet
tests: introduce a rebase bundle to use with rebase tests...
r14118 echo A > A
hg ci -Am A
echo B > B
hg ci -Am B
echo C > C
hg ci -Am C
echo D > D
hg ci -Am D
Nicolas Dumazet
tests: upgrade bundles/rebase.hg to support test-rebase-collapse...
r14119 hg up -q -C 0
echo E > E
hg ci -Am E
hg up -q -C 0
Nicolas Dumazet
tests: introduce a rebase bundle to use with rebase tests...
r14118 echo F > F
hg ci -Am F
Nicolas Dumazet
tests: upgrade bundles/rebase.hg to support test-rebase-collapse...
r14119 hg merge -r 4
hg ci -m G
hg up -q -C 5
echo H > H
hg ci -Am H
Nicolas Dumazet
tests: introduce a rebase bundle to use with rebase tests...
r14118
hg bundle -a ../rebase.hg
cd ..
rm -Rf rebase