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-dirstate.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.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-dirstate.t')
| -rw-r--r-- | tests/test-dirstate.t | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/tests/test-dirstate.t b/tests/test-dirstate.t index 6b65f59..5e5c80e 100644 --- a/tests/test-dirstate.t +++ b/tests/test-dirstate.t @@ -11,24 +11,9 @@ adding a/b/c/d/y adding a/b/c/d/z $ hg mv a z - moving a/b/c/d/x to z/b/c/d/x (glob) - moving a/b/c/d/y to z/b/c/d/y (glob) - moving a/b/c/d/z to z/b/c/d/z (glob) - -Test name collisions - - $ rm z/b/c/d/x - $ mkdir z/b/c/d/x - $ touch z/b/c/d/x/y - $ hg add z/b/c/d/x/y - abort: file 'z/b/c/d/x' in dirstate clashes with 'z/b/c/d/x/y' - [255] - $ rm -rf z/b/c/d - $ touch z/b/c/d - $ hg add z/b/c/d - abort: directory 'z/b/c/d' already in dirstate - [255] - + moving a/b/c/d/x to z/b/c/d/x + moving a/b/c/d/y to z/b/c/d/y + moving a/b/c/d/z to z/b/c/d/z $ cd .. Issue1790: dirstate entry locked into unset if file mtime is set into |