Mercurial > hg-stable
changeset 14112:3956ea942492
tests: remove test-issue322 as it's fully included in test-issue660
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Sat, 30 Apr 2011 17:38:06 +0200 |
| parents | c0e29e10b9ef |
| children | 7dc3e10fc812 |
| files | tests/test-issue322.t tests/test-issue660.t |
| diffstat | 2 files changed, 2 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-issue322.t Sat Apr 30 15:30:51 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -http://mercurial.selenic.com/bts/issue322 - -File replaced with directory: - - $ hg init a - $ cd a - $ echo a > a - $ hg commit -Ama - adding a - $ rm a - $ mkdir a - $ echo a > a/a - -Should fail - would corrupt dirstate: - - $ hg add a/a - abort: file 'a' in dirstate clashes with 'a/a' - [255] - - $ cd .. - -Directory replaced with file: - - $ hg init c - $ cd c - $ mkdir a - $ echo a > a/a - $ hg commit -Ama - adding a/a - - $ rm -r a - $ echo a > a - -Should fail - would corrupt dirstate: - - $ hg add a - abort: directory 'a' already in dirstate - [255] - - $ cd .. - -Directory replaced with file: - - $ hg init d - $ cd d - $ mkdir b - $ mkdir b/c - $ echo a > b/c/d - $ hg commit -Ama - adding b/c/d - $ rm -r b - $ echo a > b - -Should fail - would corrupt dirstate: - - $ hg add b - abort: directory 'b' already in dirstate - [255] -