view tests/bundles/rebase.sh @ 15233:81c97964d123

alias: don't shadow commands that we only partially matched (issue2993) (BC) Previously, if you set an alias for "ci", it'd also shadow "commit" even though you didn't specify that. This occurred for all commands with explicit short variations.
author Augie Fackler <durin42@gmail.com>
date Tue, 11 Oct 2011 17:20:03 -0500
parents 624e5ce615ec
children 5d57b2101ab1
line wrap: on
line source

#!/bin/bash
hg init rebase
cd rebase

#  @  7: 'H'
#  |
#  | o  6: 'G'
#  |/|
#  o |  5: 'F'
#  | |
#  | o  4: 'E'
#  |/
#  | o  3: 'D'
#  | |
#  | o  2: 'C'
#  | |
#  | o  1: 'B'
#  |/
#  o  0: 'A'

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
hg up -q -C 0
echo E > E
hg ci -Am E
hg up -q -C 0
echo F > F
hg ci -Am F
hg merge -r 4
hg ci -m G
hg up -q -C 5
echo H > H
hg ci -Am H

hg bundle -a ../rebase.hg

cd ..
rm -Rf rebase