equal
deleted
inserted
replaced
547 parent: 6:2278a4c24330 |
547 parent: 6:2278a4c24330 |
548 user: different user |
548 user: different user |
549 date: Mon Jun 30 12:12:12 1980 +0000 |
549 date: Mon Jun 30 12:12:12 1980 +0000 |
550 summary: uncommit with message |
550 summary: uncommit with message |
551 |
551 |
|
552 Bad option combinations |
|
553 |
|
554 $ hg rollback -q --config ui.rollback=True |
|
555 $ hg uncommit -U --user 'user' |
|
556 abort: --user and --currentuser are mutually exclusive |
|
557 [255] |
|
558 $ hg uncommit -D --date today |
|
559 abort: --date and --currentdate are mutually exclusive |
|
560 [255] |
552 |
561 |
553 `uncommit <dir>` and `cd <dir> && uncommit .` behave the same... |
562 `uncommit <dir>` and `cd <dir> && uncommit .` behave the same... |
554 |
563 |
555 $ hg rollback -q --config ui.rollback=True |
|
556 $ echo 2 > dir/file2.txt |
564 $ echo 2 > dir/file2.txt |
557 $ hg ci -Aqm 'add file2 in directory' |
565 $ hg ci -Aqm 'add file2 in directory' |
558 $ hg uncommit dir |
566 $ hg uncommit dir |
559 note: keeping empty commit |
567 note: keeping empty commit |
560 $ hg status |
568 $ hg status |