equal
deleted
inserted
replaced
41 Creating phase divergence, resolution of which will lead to conflicts |
41 Creating phase divergence, resolution of which will lead to conflicts |
42 ---------------------------------------------------------------------- |
42 ---------------------------------------------------------------------- |
43 |
43 |
44 $ hg up .^^^ |
44 $ hg up .^^^ |
45 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
45 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
46 $ hg grab -r .~-3 |
46 $ hg pick -r .~-3 |
47 picking 4:c41c793e0ef1 "added d" |
47 picking 4:c41c793e0ef1 "added d" |
48 $ echo foobar > c |
48 $ echo foobar > c |
49 $ hg add c |
49 $ hg add c |
50 $ hg amend |
50 $ hg amend |
51 |
51 |
149 $ hg amend |
149 $ hg amend |
150 $ hg phase -r ca1b80f --draft --force |
150 $ hg phase -r ca1b80f --draft --force |
151 $ hg prev |
151 $ hg prev |
152 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
152 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
153 [1] added a |
153 [1] added a |
154 $ hg grab -r ca1b80f |
154 $ hg pick -r ca1b80f |
155 picking 3:ca1b80f7960a "added c" |
155 picking 3:ca1b80f7960a "added c" |
156 $ echo foobar > b |
156 $ echo foobar > b |
157 $ hg add b |
157 $ hg add b |
158 $ hg amend |
158 $ hg amend |
159 $ hg phase -r c41c793e0ef1 --public --hidden |
159 $ hg phase -r c41c793e0ef1 --public --hidden |