diff tests/test-mq @ 10048:46de82e50790 stable

mq: qpop: remove added files before re-adding removed files

We need to do this to avoid file/directories conflicts.
This causes patches removing a committed file and replacing it
with a directory to be "unpoppable".

--- a/tests/test-mq	Thu Dec 10 09:35:43 2009 -0500
+++ b/tests/test-mq	Fri Dec 11 15:09:52 2009 +0900
@@ -561,3 +561,23 @@
 hg qseries -v
 hg up qparent
 hg qpop
+
+cd ..
+hg init deletion-order
+cd deletion-order
+
+touch a
+hg ci -Aqm0
+
+hg qnew rename-dir
+hg rm a
+hg qrefresh
+
+mkdir a b
+touch a/a b/b
+hg add -q a b
+hg qrefresh
+
+echo % test popping must remove files added in subdirectories first
+hg qpop
+cd ..