equal
deleted
inserted
replaced
1 #!/bin/bash |
1 #!/bin/bash |
2 hg init rebase |
2 hg init rebase |
3 cd rebase |
3 cd rebase |
|
4 |
|
5 # @ 7: 'H' |
|
6 # | |
|
7 # | o 6: 'G' |
|
8 # |/| |
|
9 # o | 5: 'F' |
|
10 # | | |
|
11 # | o 4: 'E' |
|
12 # |/ |
|
13 # | o 3: 'D' |
|
14 # | | |
|
15 # | o 2: 'C' |
|
16 # | | |
|
17 # | o 1: 'B' |
|
18 # |/ |
|
19 # o 0: 'A' |
4 |
20 |
5 echo A > A |
21 echo A > A |
6 hg ci -Am A |
22 hg ci -Am A |
7 echo B > B |
23 echo B > B |
8 hg ci -Am B |
24 hg ci -Am B |
9 hg up -q -C 0 |
|
10 echo C > C |
25 echo C > C |
11 hg ci -Am C |
26 hg ci -Am C |
12 hg up -q -C 0 |
|
13 echo D > D |
27 echo D > D |
14 hg ci -Am D |
28 hg ci -Am D |
15 hg merge -r 2 |
29 hg up -q -C 0 |
16 hg ci -m E |
30 echo E > E |
17 hg up -q -C 3 |
31 hg ci -Am E |
|
32 hg up -q -C 0 |
18 echo F > F |
33 echo F > F |
19 hg ci -Am F |
34 hg ci -Am F |
|
35 hg merge -r 4 |
|
36 hg ci -m G |
|
37 hg up -q -C 5 |
|
38 echo H > H |
|
39 hg ci -Am H |
20 |
40 |
21 hg bundle -a ../rebase.hg |
41 hg bundle -a ../rebase.hg |
22 |
42 |
23 cd .. |
43 cd .. |
24 rm -Rf rebase |
44 rm -Rf rebase |