eol with hg 1.4.x?

Martin Geisler mg at lazybytes.net
Tue Jan 5 15:22:28 CST 2010


Greg Ward <greg at gerg.ca> writes:

Hi Greg

> it looks to me like hg-eol now requires a "trunk" Mercurial, i.e. the
> stable 1.4 branch won't work. Specifically, mercurial.patch.eolmodes
> was added on the default branch, so will only be released in 1.5.
> Correct?

Yes. I believe the eolmodes change will be important in order to let
people apply patches with arbitrary EOLs and still get correct files.

> Is there a good way to test/use eol with a stable version of
> Mercurial?  I'm maintaining my own fork with a few select patches
> backported to the stable branch, so if I absolutely *must* I suppose I
> could backport the patch.eolmodes changesets.  But I'd rather not.

I think I would wait too. But if you do want to backport the patches,
then note that Patrick made some additional fixes to my original
patches:

  d8214e944b84, ea7c392f2b08, 900ccbd79ef7

> We're going live with Mercurial 1.4.x in 10 days... am I better off
> sticking with win32text for now, and switching to eol in the future?

I think so -- the eol extension is neither here nor there :-( I don't
have a very clear image of what is still missing.

It would be very helpful if you could try out the current code and help
hack on it. I'll be busy writing my dissertation in the next two months
so I cannot (should not) spend a lot of time on it :-(

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- 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/attachments/20100105/e830b46b/attachment.pgp>


More information about the Mercurial mailing list