equal
deleted
inserted
replaced
60 o 0:c471ef929e6a@default(draft) addroot |
60 o 0:c471ef929e6a@default(draft) addroot |
61 |
61 |
62 |
62 |
63 Test stabilizing a predecessor child |
63 Test stabilizing a predecessor child |
64 |
64 |
65 $ hg stabilize -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 -Dr ab8cbb6d87ff -d f5ff10856e5a |
69 resolving manifests |
69 resolving manifests |
70 getting b |
70 getting b |
86 Test stabilizing a descendant predecessors child |
86 Test stabilizing a descendant predecessors child |
87 |
87 |
88 $ hg up 7 |
88 $ hg up 7 |
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 stabilize -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 -Dr 7a7552255fb5 -d 6bf44048e43f |
95 resolving manifests |
95 resolving manifests |
96 getting b |
96 getting b |
114 | |
114 | |
115 o 7:f5ff10856e5a@default(draft) adda |
115 o 7:f5ff10856e5a@default(draft) adda |
116 | |
116 | |
117 o 0:c471ef929e6a@default(draft) addroot |
117 o 0:c471ef929e6a@default(draft) addroot |
118 |
118 |
119 $ hg stabilize -v |
119 $ hg evolve -v |
120 no troubled changeset |
120 no troubled changeset |
121 [1] |
121 [1] |
122 |
122 |
123 Test behaviour with --any |
123 Test behaviour with --any |
124 |
124 |
138 | |
138 | |
139 o 0:c471ef929e6a@default(draft) addroot |
139 o 0:c471ef929e6a@default(draft) addroot |
140 |
140 |
141 $ hg up 9 |
141 $ hg up 9 |
142 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
142 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
143 $ hg stabilize -v |
143 $ hg evolve -v |
144 nothing to stabilize here |
144 nothing to evolve here |
145 (1 troubled changesets, do you want --any ?) |
145 (1 troubled changesets, do you want --any ?) |
146 [2] |
146 [2] |
147 $ hg stabilize --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 -Dr 5e819fbb0d27 -d 4e7cec6b4afe |
151 resolving manifests |
151 resolving manifests |
152 removing c |
152 removing c |
161 | |
161 | |
162 o 7:f5ff10856e5a@default(draft) adda |
162 o 7:f5ff10856e5a@default(draft) adda |
163 | |
163 | |
164 o 0:c471ef929e6a@default(draft) addroot |
164 o 0:c471ef929e6a@default(draft) addroot |
165 |
165 |
166 $ hg stabilize --any -v |
166 $ hg evolve --any -v |
167 no troubled changeset |
167 no troubled changeset |
168 [1] |
168 [1] |