equal
deleted
inserted
replaced
329 +++ b/main-file-1 |
329 +++ b/main-file-1 |
330 @@ -3,1 +3,1 @@ |
330 @@ -3,1 +3,1 @@ |
331 -Zwei |
331 -Zwei |
332 +deux |
332 +deux |
333 $ hg log -r 'bumped()' # no more bumped |
333 $ hg log -r 'bumped()' # no more bumped |
|
334 |
|
335 test evolve --all |
|
336 $ sed -i'' -e s/deux/to/ main-file-1 |
|
337 $ hg commit -m 'dansk 2!' |
|
338 $ sed -i'' -e s/Three/tre/ main-file-1 |
|
339 $ hg commit -m 'dansk 3!' |
|
340 $ hg update 9 |
|
341 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
342 $ sed -i'' -e s/Un/Én/ main-file-1 |
|
343 $ hg commit --amend -m 'dansk!' |
|
344 2 new unstable changesets |
|
345 |
|
346 $ hg evolve --all --traceback |
|
347 move:[10] dansk 2! |
|
348 atop:[13] dansk! |
|
349 merging main-file-1 |
|
350 move:[11] dansk 3! |
|
351 atop:[14] dansk 2! |
|
352 merging main-file-1 |
|
353 $ hg glog |
|
354 @ 15 : dansk 3! - test |
|
355 | |
|
356 o 14 : dansk 2! - test |
|
357 | |
|
358 o 13 feature-B: dansk! - test |
|
359 | |
|
360 o 7 : another feature - test |
|
361 | |
|
362 o 6 feature-A: a nifty feature - test |
|
363 | |
|
364 o 0 : base - test |
|
365 |
334 |
366 |
335 $ cd .. |
367 $ cd .. |
336 |
368 |
337 enable general delta |
369 enable general delta |
338 |
370 |