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

[Nicolas Dumazet]

2009/12/13 Martin Geisler <mg at lazybytes.net>:
> 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!
>

Thanks :)

> 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?

This is the symptom of another problem.

See the current -devel thread about "add: do not retrieve
directories/missing files from dirstate.walk" :)


-- 
Nicolas Dumazet — NicDumZ