equal
deleted
inserted
replaced
34 0 1 A |
34 0 1 A |
35 |
35 |
36 Draft commit are properly created over public one: |
36 Draft commit are properly created over public one: |
37 |
37 |
38 $ hg phase --public . |
38 $ hg phase --public . |
|
39 $ hg phase |
|
40 1: public |
39 $ hglog |
41 $ hglog |
40 1 0 B |
42 1 0 B |
41 0 0 A |
43 0 0 A |
42 |
44 |
43 $ mkcommit C |
45 $ mkcommit C |
84 1 0 B |
86 1 0 B |
85 0 0 A |
87 0 0 A |
86 $ hg merge 4 # E |
88 $ hg merge 4 # E |
87 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
89 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 (branch merge, don't forget to commit) |
90 (branch merge, don't forget to commit) |
|
91 $ hg phase |
|
92 6: draft |
|
93 4: secret |
89 $ hg ci -m "merge B' and E" |
94 $ hg ci -m "merge B' and E" |
90 $ hglog |
95 $ hglog |
91 7 2 merge B' and E |
96 7 2 merge B' and E |
92 6 1 B' |
97 6 1 B' |
93 5 2 H |
98 5 2 H |