changeset 3386 | 2a51107e60cf |
parent 3379 | ef475fce0dd2 |
child 3388 | be41e4740a25 |
3385:823031b51d81 | 3386:2a51107e60cf |
---|---|
71 $ hg resolve -m |
71 $ hg resolve -m |
72 (no more unresolved files) |
72 (no more unresolved files) |
73 |
73 |
74 Continue the evolution |
74 Continue the evolution |
75 $ hg evolve --continue |
75 $ hg evolve --continue |
76 grafting 2:13833940840c "c" |
76 evolving 2:13833940840c "c" |
77 |
77 |
78 Tip should stay in secret phase |
78 Tip should stay in secret phase |
79 $ hg log -G -T "{rev}: {phase}" |
79 $ hg log -G -T "{rev}: {phase}" |
80 @ 4: draft |
80 @ 4: draft |
81 | |
81 | |