[PATCH 0 of 2 STABLE] More consistent diff -S output

Martin Geisler mg at lazybytes.net
Thu Dec 15 09:28:05 CST 2011


Renato Cunha <renato at renatocunha.com> writes:

> Hi!
>
> This is an attempt at fixing issue 3153.
>
> hg currently has inconsistent behavior when a subrepo is removed
> between two revisions it is diffing against.
>
> If a subrepo was removed after the first revision and before (or at)
> the second revision, then mercurial would crash with a KeyError
> exception not being caught[1]. But if the order of the specified
> revisions was swapped, then hg would succeed in executing the diff.
>
> [1] http://mercurial.selenic.com/bts/file1321/hg-diff-S-traceback.txt
>
> This patch series tries to fix this by giving a more consistent
> behavior to hg: just ignore the missing subrepo instead of crashing. A
> regression test is also provided.

Thanks for the patches! I applies the first, the second was made against
default so I added a simpler but equivalent test case to stable. It's
all in the crew repo!

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- 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/20111215/535d01a8/attachment.pgp>


More information about the Mercurial-devel mailing list