equal
deleted
inserted
replaced
378 Test commit -o options |
378 Test commit -o options |
379 |
379 |
380 $ hg up -r "desc('a nifty feature')" |
380 $ hg up -r "desc('a nifty feature')" |
381 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
381 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
382 $ hg revert -r "desc('another feature')" --all |
382 $ hg revert -r "desc('another feature')" --all |
|
383 reverting main-file-1 |
383 adding file-from-B |
384 adding file-from-B |
384 reverting main-file-1 |
|
385 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
385 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
386 $ hg commit -m 'another feature that rox' -o 5 |
386 $ hg commit -m 'another feature that rox' -o 5 |
387 created new head |
387 created new head |
388 $ hg log |
388 $ hg log |
389 6 feature-B: another feature that rox - test |
389 6 feature-B: another feature that rox - test |