Hi, Dear diary, on Tue, Mar 21, 2006 at 10:44:25PM CET, I got a letter where Pavel Roskin <proski@xxxxxxx> said that... > On Tue, 2006-03-21 at 21:59 +0100, Petr Baudis wrote: > > Dear diary, on Tue, Mar 21, 2006 at 09:54:14PM CET, I got a letter > > where Pavel Roskin <proski@xxxxxxx> said that... > > > From: Pavel Roskin <proski@xxxxxxx> > > > > > > Merge labels keep changing, and they are not required to identify > > > specific lines uniquely for the test purposes. > > > > > > Signed-off-by: Pavel Roskin <proski@xxxxxxx> > > > > Well, I sincerely hope that they won't change again. ;-) > > Actually, it would be nice to never expose labels starting with > ".merge_file_" - cogito should provide more meaningful labels instead. we shouldn't ever expose them, though. If we do, that's a bug. > If you prefer, I'll submit a minimal patch to 0017-alice-bob-fixup.ed > instead. Once ".merge_file_" is gone, the "tutorial" testsuite would > check that such labels never appear again. Curious, it contains the old-style label yet does not fail here now. Unfortunately I have no time to play with it now. :-( A patch will be most welcome. Thanks, -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Right now I am having amnesia and deja-vu at the same time. I think I have forgotten this before. - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html