Mercurial > hg
view tests/test-issue322.t @ 12664:545ec1775021
merge: handle no file parent in backwards merge (issue2364)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 09 Oct 2010 14:50:20 -0500 |
parents | b63f6422d2a7 |
children |
line wrap: on
line source
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]