equal
deleted
inserted
replaced
65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True |
65 $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True |
66 rebasing 1:d2ae7f538514 "b" |
66 rebasing 1:d2ae7f538514 "b" |
67 2 new divergent changesets |
67 2 new divergent changesets |
68 $ hg evolve --list |
68 $ hg evolve --list |
69 c882616e9d84: b |
69 c882616e9d84: b |
70 divergent: a922b3733e98 (precursor d2ae7f538514) |
70 divergent: a922b3733e98 (draft) (precursor d2ae7f538514) |
71 |
71 |
72 a922b3733e98: b |
72 a922b3733e98: b |
73 divergent: c882616e9d84 (precursor d2ae7f538514) |
73 divergent: c882616e9d84 (draft) (precursor d2ae7f538514) |
|
74 |
|
75 $ hg phase -p a922b3733e98 |
|
76 $ hg evolve --list |
|
77 c882616e9d84: b |
|
78 divergent: a922b3733e98 (public) (precursor d2ae7f538514) |
74 |
79 |
75 $ cd .. |
80 $ cd .. |