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:[email protected]
41 Buckmaster Road    m: +44 7770 465 077   xmpp: [email protected]
London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
Scons-dev mailing list
[email protected]
http://two.pairlist.net/mailman/listinfo/scons-dev

Reply via email to