gone without a trace from crew

Christian Ebert blacktrash at gmx.net
Thu Oct 1 16:34:36 UTC 2009


* Christian Ebert on Thursday, October 01, 2009 at 16:21:38 +0200
> * Christian Ebert on Thursday, October 01, 2009 at 14:33:58 +0200
>> * Martin Geisler on Friday, September 18, 2009 at 17:30:30 +0200
>>> Sorry about letting this lay around -- it's in crew now (1f54b1b7122f).
>> 
>> In some merge orgy it must have got lost again. test-keyword looks
>> exactly like BEFORE it was applied. The most strange thing is, I
>> can't detect this "backout" with "hg log tests/test-keyword"!
> 
> I believe bd017f359c08 or 1214c64c592b are candidates where this
> could have happened. The first was a rebase ...

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


c
-- 
Wer auf sein Elend tritt, steht höher.
_HÖLDERLIN: H Y P E R I O N_  --->> http://www.blacktrash.org/hyperion/



More information about the Mercurial-devel mailing list