equal
deleted
inserted
replaced
63 Test stabilizing a predecessor child |
63 Test stabilizing a predecessor child |
64 |
64 |
65 $ hg evolve -v |
65 $ hg evolve -v |
66 move:[5] addb |
66 move:[5] addb |
67 atop:[7] adda |
67 atop:[7] adda |
68 hg rebase -Dr ab8cbb6d87ff -d f5ff10856e5a |
68 hg rebase -r ab8cbb6d87ff -d f5ff10856e5a |
69 resolving manifests |
69 resolving manifests |
70 getting b |
70 getting b |
71 b |
71 b |
72 $ glog |
72 $ glog |
73 @ 8:6bf44048e43f@default(draft) addb |
73 @ 8:6bf44048e43f@default(draft) addb |
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
90 $ hg debugobsolete > successors.old |
90 $ hg debugobsolete > successors.old |
91 $ hg evolve -v |
91 $ hg evolve -v |
92 move:[3] addc |
92 move:[3] addc |
93 atop:[8] addb |
93 atop:[8] addb |
94 hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f |
94 hg rebase -r 7a7552255fb5 -d 6bf44048e43f |
95 resolving manifests |
95 resolving manifests |
96 getting b |
96 getting b |
97 resolving manifests |
97 resolving manifests |
98 getting c |
98 getting c |
99 c |
99 c |
145 (1 troubled changesets, do you want --any ?) |
145 (1 troubled changesets, do you want --any ?) |
146 [2] |
146 [2] |
147 $ hg evolve --any -v |
147 $ hg evolve --any -v |
148 move:[9] addc |
148 move:[9] addc |
149 atop:[11] addb |
149 atop:[11] addb |
150 hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe |
150 hg rebase -r 5e819fbb0d27 -d 4e7cec6b4afe |
151 resolving manifests |
151 resolving manifests |
152 removing c |
152 removing c |
153 getting b |
153 getting b |
154 resolving manifests |
154 resolving manifests |
155 getting c |
155 getting c |