[Scons-dev] Huge merges in Mercurial

[Russel Winder]

Hi,

I tried an experimental merge and much of the stuff looks like it will
go straight through. However there is a lot of 3-way meld resolution to
be done, hours of it, possibly days. Clearly there is no problem the
human taking breaks as long as the computer doesn't. But what if…

Has anyone any experience of checkpointing and restarting big Mercurial
merge resolutions?

-- 
Russel.
=============================================================================
Dr Russel Winder      t: +44 20 7585 2200   voip: sip:russel.winder at ekiga.net
41 Buckmaster Road    m: +44 7770 465 077   xmpp: russel at winder.org.uk
London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: This is a digitally signed message part
URL: <https://pairlist2.pair.net/pipermail/scons-dev/attachments/20151219/7c4a2326/attachment.pgp>