[PATCH] avoid false positives for addremove -s, mark II
Alexis S. L. Carvalho
alexis at cecm.usp.br
Sun Mar 4 06:54:13 CST 2007
Thus spake Erling Ellingsen:
> Polished version of the previous patch.
> >This looks mostly ok, but gmail has the annoying tendency to mangle
> >inline patches. Can you send it again as an attachment?
> Really? Neither 'patch' nor 'hg import' complained at my end. Well,
/me looks at it more carefully
Hmm... it looks like it was just mutt helpfully reformating the
format=flowed message. Sorry for the noise.
> >Put the import at the top of the file, with the other imports
> I wanted to avoid loading an extra file for the 1-$B&E(B cases where it's
> not used. However, I see that bdiff is included by mdiff anyway, so it
> didn't help. Moved.
Note that mercurial plays some tricks with Python's import mechanism to
delay the actual import until it's actually needed, so the cost of one
additional import entry is very small.
> >This assert shouldn't be needed. Well, asserts obviously should never
> >trigger, but if we really want that check, there are probably better
> >places for it.
> I put the assert there as I expected the return value of bdiff to
> change in the near future (given that it is returning uninitialized
> bits of memory right now). Removed.
Since I've pushed your other patch, I've removed the comment and the
removal of the last element.
Pushed to crew
More information about the Mercurial-devel