equal
deleted
inserted
replaced
338 $ hg update 9 |
338 $ hg update 9 |
339 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
339 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
340 $ sed -i'' -e s/Un/Én/ main-file-1 |
340 $ sed -i'' -e s/Un/Én/ main-file-1 |
341 $ hg commit --amend -m 'dansk!' |
341 $ hg commit --amend -m 'dansk!' |
342 2 new unstable changesets |
342 2 new unstable changesets |
|
343 |
|
344 (ninja test for the {trouble} template: |
|
345 |
|
346 $ hg log -G --template '{rev} {troubles}\n' |
|
347 @ 13 |
|
348 | |
|
349 | o 11 unstable |
|
350 | | |
|
351 | o 10 unstable |
|
352 | | |
|
353 | x 9 |
|
354 |/ |
|
355 o 7 |
|
356 | |
|
357 o 6 |
|
358 | |
|
359 o 0 |
|
360 |
|
361 |
|
362 |
|
363 (/ninja) |
343 |
364 |
344 $ hg evolve --all --traceback |
365 $ hg evolve --all --traceback |
345 move:[10] dansk 2! |
366 move:[10] dansk 2! |
346 atop:[13] dansk! |
367 atop:[13] dansk! |
347 merging main-file-1 |
368 merging main-file-1 |