Fwd: [PATCH 0 of 6] Win32 installer updates
Christian Boos
cboos at neuf.fr
Tue Feb 17 08:30:18 CST 2009
Pascal Quantin wrote:
> Hi,
>
> as the 1.2 release date is approaching, could someone queue at least
> my Beyond Compare's patch (sixth in the series I sent previously) ?
> Without it, a merge can fail silently if a Beyond Compare 3 window is
> already open when starting the operation. It would be quite an
> unpleasant experience...
>
I've just been bitten by this. For me, the merge operation succeeded
without any kind of warning, but lots of the merged files ended up being
empty!!
Thankfully I've read Pascal's mail earlier this morning, otherwise I'd
still be scratching my head about why this happened (I had a Beyond
Compare window opened on a different virtual desktop, completely
unrelated to the code base I was merging).
Adding the /solo flag did the trick (see
http://selenic.com/pipermail/mercurial-devel/2009-February/010241.html).
So yes, I think this fix is critical to have if you're using BC as your
merge tool.
-- Christian
More information about the Mercurial-devel
mailing list