On 2012-04-13 10:15, Stefano Lattarini wrote: > Hi Peter. > > On 04/13/2012 01:37 AM, Peter Rosin wrote: >> >> Pardon me for interrupting, but why did you base these two vala-fixes >> (this one and 11229) on the seemingly random v1.11-771-gd714ec5 >> "docs: deprecate 'cygnus' mode, help the transition"? Marc-Antoine >> did point to something else in the original report. Silly mistake? >> > Yes, I stupidly applied the patches to the top of maint rather than to > the top of the commit introducing the bug. So much following our own > advice, sigh :-(
Aha, now I see, they were simply not committed sequentially, but in parallel, and then the strange merge commit message on top of both throw me off the cliff (it says it merges two bug-fix branches *into* maint, but it only has two parents, so maint has fast-forwarded itself along the bug-fixing branches). Also, my date-ordered gitk view has the 'cygnus' parent way below so it looks like the two bug-fixing branches are based on it quite deliberately, which of course was not the case, but it made me assume they were intended to be based on the faulty commit... Cheers, Peter
