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

[Siddharth Agarwal]

On 04/10/2013 11:32 AM, Bryan O'Sullivan wrote:
> 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.

n1 is a node, not a flag. I see where the confusion is coming from 
though, and I agree that it probably makes sense to use "if n1 is not 
None" here.