merge repair (was: remove superfluous space)

[Christian Ebert]

* Martin Geisler on Thursday, October 15, 2009 at 11:03:06 +0200
> Matt Mackall <mpm at selenic.com> writes:
>> On Wed, 2009-10-14 at 23:39 +0100, Christian Ebert wrote:
>>> For your records, there's also an issue about this:
>>> http://mercurial.selenic.com/bts/issue1860
>> 
>> Looks like Martin's wandered off, remind me what the fix here is/
> 
> Yeah, I was at a conference until yesterday and I'm now trying to catch
> up on mail and IRC :-)
> 
> I of course agree with the discussion in issue1860: reapplying the
> changesets should be the easy part (I can do that tonight)

Actually Mads' method proposed in

http://mercurial.selenic.com/bts/msg10739

is much better than mine. I set up a demo repo at

http://www.blacktrash.org/hg/hg-mergerepair/

for dummies like me to understand what's going on, but Mads should
be credited.

c
-- 
\black\trash movie    _C O W B O Y_  _C A N O E_  _C O M A_
                     Ein deutscher Western/A German Western
Next show: 1 November 2009  _R O T E_  _F L O R A_  Hamburg
         --->> http://www.blacktrash.org/underdogma/ccc.php