Show More
@@ -1,44 +1,44 b'' | |||||
1 | #!/bin/bash |
|
1 | #!/usr/bin/env bash | |
2 | hg init rebase |
|
2 | hg init rebase | |
3 | cd rebase |
|
3 | cd rebase | |
4 |
|
4 | |||
5 | # @ 7: 'H' |
|
5 | # @ 7: 'H' | |
6 | # | |
|
6 | # | | |
7 | # | o 6: 'G' |
|
7 | # | o 6: 'G' | |
8 | # |/| |
|
8 | # |/| | |
9 | # o | 5: 'F' |
|
9 | # o | 5: 'F' | |
10 | # | | |
|
10 | # | | | |
11 | # | o 4: 'E' |
|
11 | # | o 4: 'E' | |
12 | # |/ |
|
12 | # |/ | |
13 | # | o 3: 'D' |
|
13 | # | o 3: 'D' | |
14 | # | | |
|
14 | # | | | |
15 | # | o 2: 'C' |
|
15 | # | o 2: 'C' | |
16 | # | | |
|
16 | # | | | |
17 | # | o 1: 'B' |
|
17 | # | o 1: 'B' | |
18 | # |/ |
|
18 | # |/ | |
19 | # o 0: 'A' |
|
19 | # o 0: 'A' | |
20 |
|
20 | |||
21 | echo A > A |
|
21 | echo A > A | |
22 | hg ci -Am A |
|
22 | hg ci -Am A | |
23 | echo B > B |
|
23 | echo B > B | |
24 | hg ci -Am B |
|
24 | hg ci -Am B | |
25 | echo C > C |
|
25 | echo C > C | |
26 | hg ci -Am C |
|
26 | hg ci -Am C | |
27 | echo D > D |
|
27 | echo D > D | |
28 | hg ci -Am D |
|
28 | hg ci -Am D | |
29 | hg up -q -C 0 |
|
29 | hg up -q -C 0 | |
30 | echo E > E |
|
30 | echo E > E | |
31 | hg ci -Am E |
|
31 | hg ci -Am E | |
32 | hg up -q -C 0 |
|
32 | hg up -q -C 0 | |
33 | echo F > F |
|
33 | echo F > F | |
34 | hg ci -Am F |
|
34 | hg ci -Am F | |
35 | hg merge -r 4 |
|
35 | hg merge -r 4 | |
36 | hg ci -m G |
|
36 | hg ci -m G | |
37 | hg up -q -C 5 |
|
37 | hg up -q -C 5 | |
38 | echo H > H |
|
38 | echo H > H | |
39 | hg ci -Am H |
|
39 | hg ci -Am H | |
40 |
|
40 | |||
41 | hg bundle -a ../rebase.hg |
|
41 | hg bundle -a ../rebase.hg | |
42 |
|
42 | |||
43 | cd .. |
|
43 | cd .. | |
44 | rm -Rf rebase |
|
44 | rm -Rf rebase |
@@ -1,32 +1,32 b'' | |||||
1 | #!/bin/bash |
|
1 | #!/usr/bin/env bash | |
2 | hg init remote |
|
2 | hg init remote | |
3 | cd remote |
|
3 | cd remote | |
4 |
|
4 | |||
5 | echo "0" >> afile |
|
5 | echo "0" >> afile | |
6 | hg add afile |
|
6 | hg add afile | |
7 | hg commit -m "0.0" |
|
7 | hg commit -m "0.0" | |
8 | echo "1" >> afile |
|
8 | echo "1" >> afile | |
9 | hg commit -m "0.1" |
|
9 | hg commit -m "0.1" | |
10 | echo "2" >> afile |
|
10 | echo "2" >> afile | |
11 | hg commit -m "0.2" |
|
11 | hg commit -m "0.2" | |
12 | echo "3" >> afile |
|
12 | echo "3" >> afile | |
13 | hg commit -m "0.3" |
|
13 | hg commit -m "0.3" | |
14 | hg update -C 0 |
|
14 | hg update -C 0 | |
15 | echo "1" >> afile |
|
15 | echo "1" >> afile | |
16 | hg commit -m "1.1" |
|
16 | hg commit -m "1.1" | |
17 | echo "2" >> afile |
|
17 | echo "2" >> afile | |
18 | hg commit -m "1.2" |
|
18 | hg commit -m "1.2" | |
19 | echo "a line" > fred |
|
19 | echo "a line" > fred | |
20 | echo "3" >> afile |
|
20 | echo "3" >> afile | |
21 | hg add fred |
|
21 | hg add fred | |
22 | hg commit -m "1.3" |
|
22 | hg commit -m "1.3" | |
23 | hg mv afile adifferentfile |
|
23 | hg mv afile adifferentfile | |
24 | hg commit -m "1.3m" |
|
24 | hg commit -m "1.3m" | |
25 | hg update -C 3 |
|
25 | hg update -C 3 | |
26 | hg mv afile anotherfile |
|
26 | hg mv afile anotherfile | |
27 | hg commit -m "0.3m" |
|
27 | hg commit -m "0.3m" | |
28 |
|
28 | |||
29 | hg bundle -a ../remote.hg |
|
29 | hg bundle -a ../remote.hg | |
30 |
|
30 | |||
31 | cd .. |
|
31 | cd .. | |
32 | rm -Rf remote |
|
32 | rm -Rf remote |
General Comments 0
You need to be logged in to leave comments.
Login now