diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-remove.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-remove.t')
| -rw-r--r-- | tests/test-remove.t | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/tests/test-remove.t b/tests/test-remove.t index f67146e..70d175b 100644 --- a/tests/test-remove.t +++ b/tests/test-remove.t @@ -29,7 +29,7 @@ the table cases $ echo b > bar $ hg add bar $ remove bar - not removing bar: file has been marked for add (use forget to undo) + not removing bar: file has been marked for add (use -f to force removal) exit code: 1 A bar ./bar @@ -196,8 +196,8 @@ dir, options none $ rm test/bar $ remove test - removing test/bar (glob) - removing test/foo (glob) + removing test/bar + removing test/foo exit code: 0 R test/bar R test/foo @@ -208,8 +208,8 @@ dir, options -f $ rm test/bar $ remove -f test - removing test/bar (glob) - removing test/foo (glob) + removing test/bar + removing test/foo exit code: 0 R test/bar R test/foo @@ -220,8 +220,8 @@ dir, options -A $ rm test/bar $ remove -A test - not removing test/foo: file still exists (use -f to force removal) (glob) - removing test/bar (glob) + not removing test/foo: file still exists (use -f to force removal) + removing test/bar exit code: 1 R test/bar ./foo @@ -232,8 +232,8 @@ dir, options -Af $ rm test/bar $ remove -Af test - removing test/bar (glob) - removing test/foo (glob) + removing test/bar + removing test/foo exit code: 0 R test/bar R test/foo @@ -250,19 +250,7 @@ test remove dropping empty trees (issue1861) adding issue1861/b/c/y adding issue1861/x $ hg rm issue1861/b - removing issue1861/b/c/y (glob) + removing issue1861/b/c/y $ hg ci -m remove $ ls issue1861 x - -test that commit does not crash if the user removes a newly added file - - $ touch f1 - $ hg add f1 - $ rm f1 - $ hg ci -A -mx - removing f1 - nothing changed - [1] - - $ cd .. |