equal
deleted
inserted
replaced
1 #!/bin/sh |
|
2 |
|
3 . $TESTDIR/helpers.sh |
|
4 |
|
5 echo "[extensions]" >> $HGRCPATH |
|
6 echo "graphlog=" >> $HGRCPATH |
|
7 echo "rebase=" >> $HGRCPATH |
|
8 |
|
9 addcommit () { |
|
10 echo $1 > $1 |
|
11 hg add $1 |
|
12 hg commit -d "${2} 0" -m $1 |
|
13 } |
|
14 |
|
15 hg init a |
|
16 cd a |
|
17 addcommit "c1" 0 |
|
18 addcommit "c2" 1 |
|
19 |
|
20 addcommit "l1" 2 |
|
21 |
|
22 hg update -C 1 |
|
23 addcommit "r1" 3 |
|
24 addcommit "r2" 4 |
|
25 hg glog --template '{rev}:{desc}\n' |
|
26 |
|
27 echo |
|
28 echo '% Rebase with no arguments - single revision in source branch' |
|
29 hg update -C 2 |
|
30 hg rebase | hidebackup |
|
31 hg glog --template '{rev}:{desc}\n' |
|
32 |
|
33 cd .. |
|
34 rm -rf a |
|
35 hg init a |
|
36 cd a |
|
37 addcommit "c1" 0 |
|
38 addcommit "c2" 1 |
|
39 |
|
40 addcommit "l1" 2 |
|
41 addcommit "l2" 3 |
|
42 |
|
43 hg update -C 1 |
|
44 addcommit "r1" 4 |
|
45 hg glog --template '{rev}:{desc}\n' |
|
46 |
|
47 echo |
|
48 echo '% Rebase with no arguments - single revision in target branch' |
|
49 hg update -C 3 |
|
50 hg rebase 2>&1 | hidebackup |
|
51 hg glog --template '{rev}:{desc}\n' |
|