64 | () draft |
66 | () draft |
65 o 0:8fa14d15e168 added hgignore |
67 o 0:8fa14d15e168 added hgignore |
66 () draft |
68 () draft |
67 |
69 |
68 $ hg phase -r c41c793e0ef1 --public --hidden |
70 $ hg phase -r c41c793e0ef1 --public --hidden |
69 1 new phase-divergent changesets |
71 1 new bumped changesets |
70 |
72 |
71 $ hg glog |
73 $ hg glog |
72 @ 6:ddba58020bc0 added d |
74 @ 7:ddba58020bc0 added d |
73 | () draft |
75 | () draft |
74 | o 4:c41c793e0ef1 added d |
76 | o 4:c41c793e0ef1 added d |
75 | | () public |
77 | | () public |
76 | o 3:ca1b80f7960a added c |
78 | o 3:ca1b80f7960a added c |
77 | | () public |
79 | | () public |
80 o 1:c7586e2a9264 added a |
82 o 1:c7586e2a9264 added a |
81 | () public |
83 | () public |
82 o 0:8fa14d15e168 added hgignore |
84 o 0:8fa14d15e168 added hgignore |
83 () public |
85 () public |
84 $ hg evolve --phase-divergent |
86 $ hg evolve --phase-divergent |
85 recreate:[6] added d |
87 recreate:[7] added d |
86 atop:[4] added d |
88 atop:[4] added d |
87 rebasing to destination parent: ca1b80f7960a |
89 rebasing to destination parent: ca1b80f7960a |
88 merging c |
90 merging c |
89 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
91 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
90 fix conflicts and see `hg help evolve.interrupted` |
92 fix conflicts and see `hg help evolve.interrupted` |
92 |
94 |
93 testing that interrupted evolve shows up in morestatus |
95 testing that interrupted evolve shows up in morestatus |
94 $ hg status -v |
96 $ hg status -v |
95 M c |
97 M c |
96 A d |
98 A d |
97 # The repository is in an unfinished *evolve* state. |
|
98 |
|
99 # Unresolved merge conflicts: |
|
100 # |
|
101 # c |
|
102 # |
|
103 # To mark files as resolved: hg resolve --mark FILE |
|
104 |
|
105 # To continue: hg evolve --continue |
|
106 # To abort: hg evolve --abort |
|
107 # To stop: hg evolve --stop |
|
108 # (also see `hg help evolve.interrupted`) |
|
109 |
|
110 |
99 |
111 $ hg parents |
100 $ hg parents |
112 changeset: 3:ca1b80f7960a |
101 changeset: 3:ca1b80f7960a |
113 user: test |
102 user: test |
114 date: Thu Jan 01 00:00:00 1970 +0000 |
103 date: Thu Jan 01 00:00:00 1970 +0000 |
115 summary: added c |
104 summary: added c |
116 |
105 |
117 changeset: 6:ddba58020bc0 |
106 changeset: 7:ddba58020bc0 |
118 tag: tip |
107 tag: tip |
119 parent: 1:c7586e2a9264 |
108 parent: 1:c7586e2a9264 |
120 user: test |
109 user: test |
121 date: Thu Jan 01 00:00:00 1970 +0000 |
110 date: Thu Jan 01 00:00:00 1970 +0000 |
122 instability: phase-divergent |
111 trouble: bumped |
123 summary: added d |
112 summary: added d |
124 |
113 |
125 |
114 |
126 $ hg evolve --abort |
115 $ hg evolve --abort |
127 evolve aborted |
116 evolve aborted |
128 working directory is now at ddba58020bc0 |
117 working directory is now at ddba58020bc0 |
129 |
118 |
130 $ hg glog |
119 $ hg glog |
131 @ 6:ddba58020bc0 added d |
120 @ 7:ddba58020bc0 added d |
132 | () draft |
121 | () draft |
133 | o 4:c41c793e0ef1 added d |
122 | o 4:c41c793e0ef1 added d |
134 | | () public |
123 | | () public |
135 | o 3:ca1b80f7960a added c |
124 | o 3:ca1b80f7960a added c |
136 | | () public |
125 | | () public |
155 picking 3:ca1b80f7960a "added c" |
144 picking 3:ca1b80f7960a "added c" |
156 $ echo foobar > b |
145 $ echo foobar > b |
157 $ hg add b |
146 $ hg add b |
158 $ hg amend |
147 $ hg amend |
159 $ hg phase -r c41c793e0ef1 --public --hidden |
148 $ hg phase -r c41c793e0ef1 --public --hidden |
160 2 new phase-divergent changesets |
149 2 new bumped changesets |
161 |
150 |
162 $ hg evolve --list |
151 $ hg evolve --list |
163 e44ebefe4f54: added d |
152 e44ebefe4f54: added d |
164 phase-divergent: c41c793e0ef1 (immutable precursor) |
153 bumped: c41c793e0ef1 (immutable precursor) |
165 |
154 |
166 28cd06b3f801: added c |
155 28cd06b3f801: added c |
167 phase-divergent: ca1b80f7960a (immutable precursor) |
156 bumped: ca1b80f7960a (immutable precursor) |
168 |
157 |
169 |
158 |
170 $ hg evolve --dry-run --all --phase-divergent |
159 $ hg evolve --dry-run --all --phase-divergent |
171 recreate:[7] added d |
160 recreate:[9] added d |
172 atop:[4] added d |
161 atop:[4] added d |
173 hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a; |
162 hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a; |
174 hg update c41c793e0ef1; |
163 hg update c41c793e0ef1; |
175 hg revert --all --rev e44ebefe4f54; |
164 hg revert --all --rev e44ebefe4f54; |
176 hg commit --msg "phase-divergent update to e44ebefe4f54" |
165 hg commit --msg "bumped update to e44ebefe4f54" |
177 recreate:[9] added c |
166 recreate:[12] added c |
178 atop:[3] added c |
167 atop:[3] added c |
179 hg rebase --rev 28cd06b3f801 --dest b1661037fa25; |
168 hg rebase --rev 28cd06b3f801 --dest b1661037fa25; |
180 hg update ca1b80f7960a; |
169 hg update ca1b80f7960a; |
181 hg revert --all --rev 28cd06b3f801; |
170 hg revert --all --rev 28cd06b3f801; |
182 hg commit --msg "phase-divergent update to 28cd06b3f801" |
171 hg commit --msg "bumped update to 28cd06b3f801" |
183 |
172 |
184 $ hg glog --hidden |
173 $ hg glog --hidden |
185 @ 9:28cd06b3f801 added c |
174 @ 12:28cd06b3f801 added c |
186 | () draft |
175 | () draft |
187 | x 8:9ff8adbe8a24 added c |
176 | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24 |
188 |/ () draft |
177 | | () draft |
189 | o 7:e44ebefe4f54 added d |
178 | x 10:9ff8adbe8a24 added c |
190 |/ () draft |
179 |/ () draft |
191 | x 6:ddba58020bc0 added d |
180 | o 9:e44ebefe4f54 added d |
192 |/ () draft |
181 |/ () draft |
|
182 | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0 |
|
183 | | () draft |
|
184 | x 7:ddba58020bc0 added d |
|
185 |/ () draft |
|
186 | x 6:7490b254b0eb temporary amend commit for cfe30edc6125 |
|
187 | | () draft |
193 | x 5:cfe30edc6125 added d |
188 | x 5:cfe30edc6125 added d |
194 |/ () draft |
189 |/ () draft |
195 | o 4:c41c793e0ef1 added d |
190 | o 4:c41c793e0ef1 added d |
196 | | () public |
191 | | () public |
197 | o 3:ca1b80f7960a added c |
192 | o 3:ca1b80f7960a added c |
202 | () public |
197 | () public |
203 o 0:8fa14d15e168 added hgignore |
198 o 0:8fa14d15e168 added hgignore |
204 () public |
199 () public |
205 |
200 |
206 $ hg evolve --phase-divergent --all |
201 $ hg evolve --phase-divergent --all |
207 recreate:[7] added d |
202 recreate:[9] added d |
208 atop:[4] added d |
203 atop:[4] added d |
209 rebasing to destination parent: ca1b80f7960a |
204 rebasing to destination parent: ca1b80f7960a |
210 computing new diff |
205 computing new diff |
211 committed as c41c793e0ef1 |
206 committed as c41c793e0ef1 |
212 recreate:[9] added c |
207 recreate:[12] added c |
213 atop:[3] added c |
208 atop:[3] added c |
214 rebasing to destination parent: b1661037fa25 |
209 rebasing to destination parent: b1661037fa25 |
215 merging b |
210 merging b |
216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
211 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
217 fix conflicts and see `hg help evolve.interrupted` |
212 fix conflicts and see `hg help evolve.interrupted` |
220 $ hg evolve --abort |
215 $ hg evolve --abort |
221 evolve aborted |
216 evolve aborted |
222 working directory is now at 28cd06b3f801 |
217 working directory is now at 28cd06b3f801 |
223 |
218 |
224 $ hg glog --hidden |
219 $ hg glog --hidden |
225 @ 9:28cd06b3f801 added c |
220 @ 12:28cd06b3f801 added c |
226 | () draft |
221 | () draft |
227 | x 8:9ff8adbe8a24 added c |
222 | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24 |
228 |/ () draft |
223 | | () draft |
229 | o 7:e44ebefe4f54 added d |
224 | x 10:9ff8adbe8a24 added c |
230 |/ () draft |
225 |/ () draft |
231 | x 6:ddba58020bc0 added d |
226 | o 9:e44ebefe4f54 added d |
232 |/ () draft |
227 |/ () draft |
|
228 | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0 |
|
229 | | () draft |
|
230 | x 7:ddba58020bc0 added d |
|
231 |/ () draft |
|
232 | x 6:7490b254b0eb temporary amend commit for cfe30edc6125 |
|
233 | | () draft |
233 | x 5:cfe30edc6125 added d |
234 | x 5:cfe30edc6125 added d |
234 |/ () draft |
235 |/ () draft |
235 | o 4:c41c793e0ef1 added d |
236 | o 4:c41c793e0ef1 added d |
236 | | () public |
237 | | () public |
237 | o 3:ca1b80f7960a added c |
238 | o 3:ca1b80f7960a added c |
251 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
252 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
252 $ echo foobar > c |
253 $ echo foobar > c |
253 $ hg amend |
254 $ hg amend |
254 |
255 |
255 $ hg glog --hidden |
256 $ hg glog --hidden |
256 @ 10:ef9b72b9b42c added d |
257 @ 14:ef9b72b9b42c added d |
257 | () draft |
258 | () draft |
258 | o 9:28cd06b3f801 added c |
259 | x 13:8d4b16b17719 temporary amend commit for e44ebefe4f54 |
259 |/ () draft |
260 | | () draft |
260 | x 8:9ff8adbe8a24 added c |
261 +---o 12:28cd06b3f801 added c |
261 |/ () draft |
262 | | () draft |
262 | x 7:e44ebefe4f54 added d |
263 | | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24 |
263 |/ () draft |
264 | | | () draft |
264 | x 6:ddba58020bc0 added d |
265 +---x 10:9ff8adbe8a24 added c |
265 |/ () draft |
266 | | () draft |
|
267 | x 9:e44ebefe4f54 added d |
|
268 |/ () draft |
|
269 | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0 |
|
270 | | () draft |
|
271 | x 7:ddba58020bc0 added d |
|
272 |/ () draft |
|
273 | x 6:7490b254b0eb temporary amend commit for cfe30edc6125 |
|
274 | | () draft |
266 | x 5:cfe30edc6125 added d |
275 | x 5:cfe30edc6125 added d |
267 |/ () draft |
276 |/ () draft |
268 | o 4:c41c793e0ef1 added d |
277 | o 4:c41c793e0ef1 added d |
269 | | () public |
278 | | () public |
270 | o 3:ca1b80f7960a added c |
279 | o 3:ca1b80f7960a added c |
275 | () public |
284 | () public |
276 o 0:8fa14d15e168 added hgignore |
285 o 0:8fa14d15e168 added hgignore |
277 () public |
286 () public |
278 |
287 |
279 $ hg evolve --phase-divergent --all |
288 $ hg evolve --phase-divergent --all |
280 recreate:[9] added c |
289 recreate:[12] added c |
281 atop:[3] added c |
290 atop:[3] added c |
282 rebasing to destination parent: b1661037fa25 |
291 rebasing to destination parent: b1661037fa25 |
283 merging b |
292 merging b |
284 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
293 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
285 fix conflicts and see `hg help evolve.interrupted` |
294 fix conflicts and see `hg help evolve.interrupted` |
288 $ echo watwat > c |
297 $ echo watwat > c |
289 $ hg resolve -m |
298 $ hg resolve -m |
290 (no more unresolved files) |
299 (no more unresolved files) |
291 continue: hg evolve --continue |
300 continue: hg evolve --continue |
292 $ hg evolve --continue |
301 $ hg evolve --continue |
293 evolving 9:28cd06b3f801 "added c" |
302 evolving 12:28cd06b3f801 "added c" |
294 computing new diff |
303 computing new diff |
295 committed as 95d746965290 |
304 committed as a71c993be085 |
296 recreate:[10] added d |
305 recreate:[14] added d |
297 atop:[4] added d |
306 atop:[4] added d |
298 rebasing to destination parent: ca1b80f7960a |
307 rebasing to destination parent: ca1b80f7960a |
299 merging c |
308 merging c |
300 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
309 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
301 fix conflicts and see `hg help evolve.interrupted` |
310 fix conflicts and see `hg help evolve.interrupted` |
304 $ hg evolve --abort |
313 $ hg evolve --abort |
305 evolve aborted |
314 evolve aborted |
306 working directory is now at ef9b72b9b42c |
315 working directory is now at ef9b72b9b42c |
307 |
316 |
308 $ hg glog --hidden |
317 $ hg glog --hidden |
309 @ 10:ef9b72b9b42c added d |
318 @ 14:ef9b72b9b42c added d |
310 | () draft |
319 | () draft |
311 | o 9:28cd06b3f801 added c |
320 | x 13:8d4b16b17719 temporary amend commit for e44ebefe4f54 |
312 |/ () draft |
321 | | () draft |
313 | x 8:9ff8adbe8a24 added c |
322 +---o 12:28cd06b3f801 added c |
314 |/ () draft |
323 | | () draft |
315 | x 7:e44ebefe4f54 added d |
324 | | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24 |
316 |/ () draft |
325 | | | () draft |
317 | x 6:ddba58020bc0 added d |
326 +---x 10:9ff8adbe8a24 added c |
318 |/ () draft |
327 | | () draft |
319 | x 5:cfe30edc6125 added d |
328 | x 9:e44ebefe4f54 added d |
320 |/ () draft |
329 |/ () draft |
321 | o 4:c41c793e0ef1 added d |
330 | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0 |
322 | | () public |
331 | | () draft |
323 | o 3:ca1b80f7960a added c |
332 | x 7:ddba58020bc0 added d |
324 | | () public |
333 |/ () draft |
325 | o 2:b1661037fa25 added b |
334 | x 6:7490b254b0eb temporary amend commit for cfe30edc6125 |
326 |/ () public |
335 | | () draft |
327 o 1:c7586e2a9264 added a |
336 | x 5:cfe30edc6125 added d |
328 | () public |
337 |/ () draft |
329 o 0:8fa14d15e168 added hgignore |
338 | o 4:c41c793e0ef1 added d |
330 () public |
339 | | () public |
|
340 | o 3:ca1b80f7960a added c |
|
341 | | () public |
|
342 | o 2:b1661037fa25 added b |
|
343 |/ () public |
|
344 o 1:c7586e2a9264 added a |
|
345 | () public |
|
346 o 0:8fa14d15e168 added hgignore |
|
347 () public |