[PATCH 2 of 2] manifestmerge: handle workdir removed, remote removed with flags

[Bryan O'Sullivan]

On Wed, Apr 10, 2013 at 11:21 AM, Siddharth Agarwal <sid0 at fb.com> wrote:

> +            if not n1:
> +                # Since n1 == n2, the file isn't present in m2 either.
> This
> +                # means that the file was removed or deleted locally and
> +                # removed remotely, but that residual entries remain in
> flags.
> +                # This can happen in manifests generated by workingctx.
>

In your previous patch, you mentioned "we can legitimately have
manifestdict's _flags set to ''", but here you're doing one of those Python
truthy-false tests that will pass if n1 is either '' or None. That's too
clever for me - I have no idea what expectations I should have of this
code's behaviour.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130410/3dec6c63/attachment.html>