equal
deleted
inserted
replaced
294 $ hg log |
294 $ hg log |
295 8 feature-B: another feature that rox - test |
295 8 feature-B: another feature that rox - test |
296 6 feature-A: a nifty feature - test |
296 6 feature-A: a nifty feature - test |
297 0 : base - test |
297 0 : base - test |
298 |
298 |
299 phase change turning obsolete changeset public issue a latecomer warning |
299 phase change turning obsolete changeset public issue a bumped warning |
300 |
300 |
301 $ hg phase --public 7 |
301 $ hg phase --public 7 |
302 1 new latecomer changesets |
302 1 new bumped changesets |
303 |
303 |
304 all solving latecomer troubled |
304 all solving bumped troubled |
305 |
305 |
306 $ hg glog |
306 $ hg glog |
307 @ 8 feature-B: another feature that rox - test |
307 @ 8 feature-B: another feature that rox - test |
308 | |
308 | |
309 | o 7 : another feature - test |
309 | o 7 : another feature - test |
314 |
314 |
315 $ hg evolve --any --traceback |
315 $ hg evolve --any --traceback |
316 recreate:[8] another feature that rox |
316 recreate:[8] another feature that rox |
317 atop:[7] another feature |
317 atop:[7] another feature |
318 computing new diff |
318 computing new diff |
319 commited as 8d77fa12ab0c |
319 commited as 53ff506edef1 |
320 $ hg glog |
320 $ hg glog |
321 @ 9 feature-B: latecomer update to 5f4744038ed5: - test |
321 @ 9 feature-B: bumped update to 5f4744038ed5: - test |
322 | |
322 | |
323 o 7 : another feature - test |
323 o 7 : another feature - test |
324 | |
324 | |
325 o 6 feature-A: a nifty feature - test |
325 o 6 feature-A: a nifty feature - test |
326 | |
326 | |
332 --- a/main-file-1 |
332 --- a/main-file-1 |
333 +++ b/main-file-1 |
333 +++ b/main-file-1 |
334 @@ -3,1 +3,1 @@ |
334 @@ -3,1 +3,1 @@ |
335 -Zwei |
335 -Zwei |
336 +deux |
336 +deux |
337 $ hg log -r 'latecomer()' # no more latecomer |
337 $ hg log -r 'bumped()' # no more bumped |
338 |
338 |
339 $ cd .. |
339 $ cd .. |
340 |
340 |
341 enable general delta |
341 enable general delta |
342 |
342 |