On Mon, Nov 03, 2008 at 08:19:40PM -0600, Raphael Geissert wrote: > On Sunday 21 September 2008, you wrote: > > On Sun, Sep 21, 2008 at 01:33:54PM -0500, Raphael Geissert wrote: > > > Forwarding a patch I sent in [EMAIL PROTECTED] to the BTS, so it > > > is noticed. > > > > This one is currently on my 2.1.0 TODO list. Which should not keep > > anyone else from picking it up earlier of course ;) > > I'm not really sure, but I think you sent me an email about this and the > patch > no longer applying in master. I can't confirm that you actually said that > because I haven't found any email stating such a thing but well... > > Attached is the output of git diff origin/master -- checks/debhelper*; IOW: > if > the previous patch does no longer apply just don't apply those modifying > checks/debhelper* and apply the one attached in this email. > > And since I haven't found where I sent the script that takes care of updating > the data files I'm also attaching it. > > I hope this isn't a confusion on my side.
Yeah, I remember sending that mail, too, but also can't find it currently. Anyway, the whole problem could be mitigated in the future if you use proper topic branches for your patches, at least the more invasive ones. This one didn't apply, because it was based upon earlier patches of you that aren't applied and so no 3-way merge is possible, because my git repository doesn't contain the necessary files. I will fix up that one by hand now, since I already started with it. Gruesse, -- Frank Lichtenheld <[EMAIL PROTECTED]> www: http://www.djpig.de/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]