Show More
1 | NO CONTENT: new file 100644, binary diff hidden |
|
NO CONTENT: new file 100644, binary diff hidden |
@@ -0,0 +1,24 b'' | |||||
|
1 | #!/bin/bash | |||
|
2 | hg init rebase | |||
|
3 | cd rebase | |||
|
4 | ||||
|
5 | echo A > A | |||
|
6 | hg ci -Am A | |||
|
7 | echo B > B | |||
|
8 | hg ci -Am B | |||
|
9 | hg up -q -C 0 | |||
|
10 | echo C > C | |||
|
11 | hg ci -Am C | |||
|
12 | hg up -q -C 0 | |||
|
13 | echo D > D | |||
|
14 | hg ci -Am D | |||
|
15 | hg merge -r 2 | |||
|
16 | hg ci -m E | |||
|
17 | hg up -q -C 3 | |||
|
18 | echo F > F | |||
|
19 | hg ci -Am F | |||
|
20 | ||||
|
21 | hg bundle -a ../rebase.hg | |||
|
22 | ||||
|
23 | cd .. | |||
|
24 | rm -Rf rebase |
@@ -7,45 +7,16 b'' | |||||
7 | > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
|
7 | > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | |
8 | > EOF |
|
8 | > EOF | |
9 |
|
9 | |||
10 |
|
||||
11 | $ hg init a |
|
10 | $ hg init a | |
12 | $ cd a |
|
11 | $ cd a | |
13 |
|
12 | $ hg unbundle $TESTDIR/bundles/rebase.hg | ||
14 | $ echo A > A |
|
13 | adding changesets | |
15 | $ hg ci -Am A |
|
14 | adding manifests | |
16 | adding A |
|
15 | adding file changes | |
17 |
|
16 | added 6 changesets with 5 changes to 5 files (+2 heads) | ||
18 | $ echo B > B |
|
17 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
19 | $ hg ci -Am B |
|
18 | $ hg up tip | |
20 | adding B |
|
19 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 |
|
||||
22 | $ hg up -q -C 0 |
|
|||
23 |
|
||||
24 | $ echo C > C |
|
|||
25 | $ hg ci -Am C |
|
|||
26 | adding C |
|
|||
27 | created new head |
|
|||
28 |
|
||||
29 | $ hg up -q -C 0 |
|
|||
30 |
|
||||
31 | $ echo D > D |
|
|||
32 | $ hg ci -Am D |
|
|||
33 | adding D |
|
|||
34 | created new head |
|
|||
35 |
|
||||
36 | $ hg merge -r 2 |
|
|||
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
38 | (branch merge, don't forget to commit) |
|
|||
39 |
|
||||
40 | $ hg ci -m E |
|
|||
41 |
|
||||
42 | $ hg up -q -C 3 |
|
|||
43 |
|
||||
44 | $ echo F > F |
|
|||
45 | $ hg ci -Am F |
|
|||
46 | adding F |
|
|||
47 | created new head |
|
|||
48 |
|
||||
49 | $ cd .. |
|
20 | $ cd .. | |
50 |
|
21 | |||
51 |
|
22 |
@@ -10,42 +10,14 b'' | |||||
10 |
|
10 | |||
11 | $ hg init a |
|
11 | $ hg init a | |
12 | $ cd a |
|
12 | $ cd a | |
13 |
|
13 | $ hg unbundle $TESTDIR/bundles/rebase.hg | ||
14 | $ echo A > A |
|
14 | adding changesets | |
15 | $ hg ci -Am A |
|
15 | adding manifests | |
16 | adding A |
|
16 | adding file changes | |
17 |
|
17 | added 6 changesets with 5 changes to 5 files (+2 heads) | ||
18 | $ echo B > B |
|
18 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
19 | $ hg ci -Am B |
|
19 | $ hg up tip | |
20 | adding B |
|
20 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
21 |
|
||||
22 | $ hg up -q -C 0 |
|
|||
23 |
|
||||
24 | $ echo C > C |
|
|||
25 | $ hg ci -Am C |
|
|||
26 | adding C |
|
|||
27 | created new head |
|
|||
28 |
|
||||
29 | $ hg up -q -C 0 |
|
|||
30 |
|
||||
31 | $ echo D > D |
|
|||
32 | $ hg ci -Am D |
|
|||
33 | adding D |
|
|||
34 | created new head |
|
|||
35 |
|
||||
36 | $ hg merge -r 2 |
|
|||
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
38 | (branch merge, don't forget to commit) |
|
|||
39 |
|
||||
40 | $ hg ci -m E |
|
|||
41 |
|
||||
42 | $ hg up -q -C 3 |
|
|||
43 |
|
||||
44 | $ echo F > F |
|
|||
45 | $ hg ci -Am F |
|
|||
46 | adding F |
|
|||
47 | created new head |
|
|||
48 |
|
||||
49 | $ cd .. |
|
21 | $ cd .. | |
50 |
|
22 | |||
51 |
|
23 |
General Comments 0
You need to be logged in to leave comments.
Login now