[PATCH stable] mq: qpop: remove added files before re-adding removed files

[Martin Geisler]

Nicolas Dumazet <nicdumz at gmail.com> writes:

> # HG changeset patch
> # User Nicolas Dumazet <nicdumz.commits at gmail.com>
> # Date 1260511792 -32400
> # Node ID 90a0630c2e79122a7a0a048b25939a7e50b3c151
> # Parent  2b630e4c8f2f626f1e5d0f88646463968860f8ac
> mq: qpop: remove added files before re-adding removed files

Pushed to the stable branch as 46de82e50790, thanks!

> diff --git a/tests/test-mq b/tests/test-mq
> --- a/tests/test-mq
> +++ b/tests/test-mq
> @@ -561,3 +561,22 @@
>  hg qseries -v
>  hg up qparent
>  hg qpop
> +
> +cd ..
> +hg init deletion-order
> +cd deletion-order
> +
> +touch a
> +hg ci -Aqm0
> +
> +hg qnew -DU rename-dir
> +hg rm a

I had to insert a 'hg qrefresh' here. Otherwise I got this warning:

  a not added: only files and symlinks supported currently

which (strangely) you had not added to the test-mq.out file. The warning
comes from localrepository.add. Did you just forget to update the
test-mq.out file, or is this a symptom of another problem?

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091212/7a2bf5c8/attachment.pgp>