merging debian changelog

2008-01-07 Thread Pierre Habouzit
angelog.py <(git show debian-sid:debian/changelog) <(git show debian-experimental:debian/changelog) > debian/changelog It'll leave conflicts marks for the entries for a _same_ debian version but with different content. This needs python-apt. --

Re: merging debian changelog

2008-01-07 Thread Pierre Habouzit
On lun, jan 07, 2008 at 10:43:58 +, Pierre Habouzit wrote: > I know this is a painful thing to do (if you consider the inherent > triviality of it), hence I ended up writing a custom merger. This is all > very sketchy, but I'm sure people will enhance it :) Here is a better

Re: merging debian changelog

2008-01-07 Thread Pierre Habouzit
On Mon, Jan 07, 2008 at 11:55:07PM +, Pierre Habouzit wrote: > On lun, jan 07, 2008 at 10:43:58 +0000, Pierre Habouzit wrote: > > I know this is a painful thing to do (if you consider the inherent > > triviality of it), hence I ended up writing a custom merger. This is all &

Re: merging debian changelog

2008-01-07 Thread Pierre Habouzit
On Mon, Jan 07, 2008 at 11:21:44PM +, James Westby wrote: > On (07/01/08 23:43), Pierre Habouzit wrote: > > I know this is a painful thing to do (if you consider the inherent > > triviality of it), hence I ended up writing a custom merger. This is all > > very sketchy

Re: merging debian changelog

2008-01-11 Thread Pierre Habouzit
> http://lists.madduck.net/pipermail/vcs-pkg/2008-January/000102.html To madduck: it's not mailman's fault, rather pipermail, that is a real PoS. Us mhonarch if you want a better archive, or anything else but pipermail. It's usually really easy to plug in mailma

Re: tracking upstream's git repo and autotools

2008-02-16 Thread Pierre Habouzit
e *.m4 files around to generate the configure properly. FWIW, the autoconfiguration of the upstream source is just another patch to apply at build time. Even with properly "autoconfigured" upstream, you often want to autoreconf and or relibtoolize (to support kfreebsd and friends or

Re: tracking upstream's git repo and autotools

2008-02-16 Thread Pierre Habouzit
On Sat, Feb 16, 2008 at 11:58:02PM +, Russ Allbery wrote: > Pierre Habouzit <[EMAIL PROTECTED]> writes: > > > It takes a lot of time, and prevents builds repeatability, in the > > sense that when autotools have backward compatibility issues, it breaks, > > no

Re: tracking upstream's git repo and autotools

2008-02-17 Thread Pierre Habouzit
On Sun, Feb 17, 2008 at 08:15:00AM +, Lars Wirzenius wrote: > On su, 2008-02-17 at 01:07 +0100, Pierre Habouzit wrote: > > Well, tell that to arm or m68k buildds. On some KDE packages, > > autoconfiguring can *literally* take hours. > > Is it just running configure tha

Re: How to cope with patches sanely

2008-02-23 Thread Pierre Habouzit
ith those, it would be just plain great if you just could generate those instead of a big bloat of unreadable diff (maybe your packages don't have megabytes of diffs, but as soon as you relibtoolize a package, they do). IOW, I'm totally seconding David here. -- ·O· Pierre Ha

Re: How to cope with patches sanely

2008-02-25 Thread Pierre Habouzit
; >> > >> > The problem is that you and Manoj assume that this is the only way > >> > to do things. I don't believe this. Pierre Habouzit has been > >> > experimenting with an alternative method of feature branches that > >> > exports to a

Re: [errata] How to cope with patches sanely

2008-02-25 Thread Pierre Habouzit
On Mon, Feb 25, 2008 at 09:33:48AM +, Pierre Habouzit wrote: > When it comes to specific patches of yours, I really believe that I really *don't* believe > topic branches like you advertise them are the best answer. Git makes --

Re: How to cope with patches sanely

2008-02-25 Thread Pierre Habouzit
On Mon, Feb 25, 2008 at 04:06:31PM +, Cyril Brulebois wrote: > On 25/02/2008, Pierre Habouzit wrote: > > I'm planning to write a textual version of what I demonstrated at > > FOSDEM, with some more ideas that I had talking with Julien Cristau > > on the grass