gone without a trace from crew

[Christian Ebert]

* Martin Geisler on Thursday, October 01, 2009 at 20:50:52 +0200
> Christian Ebert <blacktrash at gmx.net> writes:
>> The following changes have disappeared:
>> 
>> 3b283adcc720
>> 552c5a5a3502
>> cec9fb4e07a1
>> 1f54b1b7122f
>> 
>> http://hg.intevation.org/beta/mercurial/crew/graph/1214c64c592b
>> 
>> shows that they are in between the accidental rebase c564dbb2a6d5 and
>> the 2nd attempt to merge c655432c2c24
> 
> Looking at it with Christian on IRC we discovered that the changes
> 9457:9460 below disappeared in the first merge (c655432c2c24):
> 
>  o    9463:9462,9460   c655432c2c24   2009-09-18 17:23 +0200   mg
>| \     Merge with crew-stable
>|| 
>| o  9462   bd017f359c08   2009-09-18 21:25 +0900   shunichi
>||   win32mbcs: util.normpath should be wrapped.
>|| 
>| o  9461:9456   ffeaf5ba25d8   2009-09-17 17:39 -0500   steve
>||   demandimport: blacklist gtk
>|| 
>  o |  9460   1f54b1b7122f   2009-09-10 23:15 +0200   blacktrash
>||   test-keyword: run kwdemo before setting up [keyword] files
>|| 
>  o |  9459   cec9fb4e07a1   2009-09-13 03:04 +0300   timeless
>||   record: remove superfluous space
>|| 
>  o |  9458   552c5a5a3502   2009-09-17 22:30 -0400   steve
>||   contrib/bash_completion: add tab completion for some [...]
>|| 
>  o |  9457   3b283adcc720   2009-09-17 22:28 -0400   steve
>| /     bookmarks: support --quiet
>| 
>  o    9456:9455,9454   c564dbb2a6d5   2009-09-17 21:52 +0200   mg
>| \     Merge with crew-stable
>|| 
> 
> I somehow rebased 9462 (bd017f359c08, "win32mbcs: util.normpath...") and
> 9463 (c655432c2c24, "Merge with crew-stable") even though I find it
> strange that I dared rebase a merge...
> 
> I have not yet tried to reproduce it, if not before, then I'll give it a
> go on Saturday.

I can't reproduce it, but from a pragmatic pov this seems to
recover the 4 "lost" changesets:

hg backout --merge c655432c2c24 --parent 1f54b1b7122f

(manually reverting win32mbc.py to its latest state)

I've set this up for inspection:

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

Probably rebase should WARN/abort with merge csets? You can't
import merge revisions in mq either.

c
-- 
  Was heißt hier Dogma, ich bin Underdogma!
[ What the hell do you mean dogma, I am underdogma. ]

_F R E E_  _V I D E O S_  --->>> http://www.blacktrash.org/underdogma/