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

[Gary Oberbrunner]

On Sun, Oct 14, 2012 at 8:50 AM, Russel Winder <russel at winder.org.uk> wrote:


> 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".



I posted a question on Stack Overflow.
http://stackoverflow.com/questions/12882672/how-can-i-back-out-a-backout-of-a-merge-in-mercurial--
hopefully someone will have good advice.

-- 
Gary
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://two.pairlist.net/pipermail/scons-dev/attachments/20121014/9088c483/attachment.html>