[Scons-dev] Mercurial and the current SCons workflow are incompatible?

[Russel Winder]

Gary,

This seemingly just gets worse.

From: http://mercurial.selenic.com/wiki/Backout

        Warning
        
        Backing out a merge will lead to trouble if you ever want to
        redo the merge. The only safe way to deal with a bad merge is to
        abandon the branch.

I think the corollary of this for the SCons workflow is "we're screwed".
 
-- 
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: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
Url : <http://two.pairlist.net/pipermail/scons-dev/attachments/20121014/8fb791a8/attachment-0001.pgp>