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