diff options
Diffstat (limited to 'tests/test-commit.t')
| -rw-r--r-- | tests/test-commit.t | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/tests/test-commit.t b/tests/test-commit.t index 21fd277..afe4b79 100644 --- a/tests/test-commit.t +++ b/tests/test-commit.t @@ -43,7 +43,7 @@ commit added file that has been deleted $ mkdir dir $ echo boo > dir/file $ hg add - adding dir/file (glob) + adding dir/file $ hg -v commit -m commit-9 dir dir/file committed changeset 2:d2a76177cb42 @@ -71,16 +71,12 @@ commit added file that has been deleted $ cd .. $ hg commit -m commit-14 does-not-exist - abort: does-not-exist: * (glob) + abort: does-not-exist: No such file or directory [255] - -#if symlink $ ln -s foo baz $ hg commit -m commit-15 baz abort: baz: file not tracked! [255] -#endif - $ touch quux $ hg commit -m commit-16 quux abort: quux: file not tracked! @@ -117,8 +113,8 @@ partial subdir commit test $ mkdir bar $ echo bar > bar/bar $ hg add - adding bar/bar (glob) - adding foo/foo (glob) + adding bar/bar + adding foo/foo $ hg ci -m commit-subdir-1 foo $ hg ci -m commit-subdir-2 bar @@ -222,6 +218,7 @@ subdir log Issue1049: Hg permits partial commit of merge without warning + $ cd .. $ hg init issue1049 $ cd issue1049 $ echo a > a @@ -282,26 +279,3 @@ test commit message content HG: removed removed abort: empty commit message [255] - $ cd .. - - -commit copy - - $ hg init dir2 - $ cd dir2 - $ echo bleh > bar - $ hg add bar - $ hg ci -m 'add bar' - - $ hg cp bar foo - $ echo >> bar - $ hg ci -m 'cp bar foo; change bar' - - $ hg debugrename foo - foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 - $ hg debugindex bar - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 6 ..... 0 26d3ca0dfd18 000000000000 000000000000 (re) - 1 6 7 ..... 1 d267bddd54f7 26d3ca0dfd18 000000000000 (re) - - $ cd .. |