[PATCH 0 of 4] keyword: support rollback, handle diffs more gracefully

Martin Geisler mg at lazybytes.net
Sun Sep 26 13:57:22 CDT 2010


Christian Ebert <blacktrash at gmx.net> writes:

> Hi,
>
> The most important change in this series is the support of the
> rollback command by the keyword extension (4th patch).
>
> While not having an immediate effect on the repository itself, in
> conjunction with the 3rd patch it improves the user experience by
> eliminating more chances that spurious differences are presented to
> the user.
>
> The 3rd patch suppresses any expansion within a diff operation. The
> main reason for expanding keywords when comparing with the working
> directory was in fact to detect "wrong" expansions caused by rollback.
>
> The first 2 patches are minor fixes, the 2nd is a resend.

Thanks! I've pushed the patches to the default branch (6401e8547427,
0b5d7da3bb78, 5d00a35ea2ea, and 4846e8cd9327) since the commit messages
made it sounds like they fixes small and spurious issues and/or add
support for a new command that previously ignored keywords.

-- 
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/20100926/b9235d75/attachment.pgp>


More information about the Mercurial-devel mailing list