Lobbying for -p1 diffs
Michael Ellerman
michael at ellerman.id.au
Tue Feb 28 14:09:38 GMT 2006
On 2/28/06, Wouter van Heyst <larstiq at larstiq.dyndns.org> wrote:
> On Mon, Feb 27, 2006 at 01:12:04PM +1100, Michael Ellerman wrote:
> > On 2/27/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
> > > Michael Ellerman wrote:
> > > > Hi guys,
> > > >
> > > > I just thought I'd pipe up once more before 0.8 freezes, and lobby for
> > > > diff producing -p1 format diffs.
> > >
> > > What are your preferred prefixes then? 'mod/' and 'orig/'?
> >
> > I'd prefer branch-nick.org and branch-nick, eg:
> >
> > --- work.orig/arch/powerpc/kernel/setup-common.c
> > +++ work/arch/powerpc/kernel/setup-common.c
>
> Hmm, will branch nick work with "Aaron's integration" type nicks?
> +1 on using -p1, just need to figure out sensible labels.
You're right, I forgot you could set branch nick to something
arbitrary. With a nick like that it definitely wouldn't work, or at
least you might be able to make patch accept it with appopriate
escapes, but it'd look horrible, so that'd suck.
For the moment we can just use a/ b/ or orig/ mod/, the point is to
make it -p1 before 0.8, we can retrofit nicks later if we can work out
how to do it nicely.
cheers
More information about the bazaar
mailing list