remove superfluous space

[Christian Ebert]

* Matt Mackall on Wednesday, October 14, 2009 at 17:49:13 -0500
> On Wed, 2009-10-14 at 23:39 +0100, Christian Ebert wrote:
>> * timeless on Wednesday, October 14, 2009 at 20:53:34 +0300
>>> On Fri, Sep 18, 2009 at 6:31 PM, Martin Geisler <mg at lazybytes.net> wrote:
>>>> timeless <timeless at gmail.com> writes:
>>>>> # HG changeset patch
>>>>> # User timeless at mozdev.org
>>>>> # Date 1252800280 -10800
>>>>> # Node ID 5a7b45da264df42bc8cc15fd57bc6183af4e380c
>>>>> # Parent  b2f3b9c82ac05283917e274e96f33c59e491f83c
>>>>> [record] remove superfluous space
>>>> 
>>>> It's in crew (cec9fb4e07a1) along with updated tests... :-)
>>> 
>>> for my records, this was destroyed by the great merge loss
>>> 
>>> Subject: Re: gone without a trace from crew
>>> Message-ID: <87ljjvc5ir.fsf at hbox.dyndns.org>
>> 
>> 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/

This pragmatic approach works imho:

hg backout --merge c655432c2c24 --parent 1f54b1b7122f
[ commit message ]
hg revert -r [previous tip] hgext/win32mbcs.py
hg commit -m 'Merge after backout'

You can have a look at the top 2 csets here:

http://www.blacktrash.org/hg/hgexptl/

Might be too amateurish, but the result looks ok to me.

I'd still like to know whether such a scenerio can happen without
rebase.

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