Mercurial > hg
diff tests/test-mq.out @ 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".
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Fri, 11 Dec 2009 15:09:52 +0900 |
| parents | c51494c53841 |
| children | fa7170d6529f d355cebde5e6 |
line wrap: on
line diff
--- a/tests/test-mq.out Thu Dec 10 09:35:43 2009 -0500 +++ b/tests/test-mq.out Fri Dec 11 15:09:52 2009 +0900 @@ -612,3 +612,6 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved popping empty patch queue now empty +% test popping must remove files added in subdirectories first +popping rename-dir +patch queue now empty