* bk-commits: diff -p?
@ 2004-11-08 8:41 Geert Uytterhoeven
2004-11-08 15:51 ` David Woodhouse
2004-11-08 16:43 ` Larry McVoy
0 siblings, 2 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2004-11-08 8:41 UTC (permalink / raw)
To: Larry McVoy; +Cc: Linux Kernel Development
Hi Larry,
Would it be possible to enable the `-p' option (Show which C function each
change is in) of diff for all patches sent to the bk-commits-* mailing lists?
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-08 8:41 bk-commits: diff -p? Geert Uytterhoeven
@ 2004-11-08 15:51 ` David Woodhouse
2004-11-08 16:16 ` Geert Uytterhoeven
2004-11-08 16:43 ` Larry McVoy
1 sibling, 1 reply; 9+ messages in thread
From: David Woodhouse @ 2004-11-08 15:51 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Larry McVoy, Linux Kernel Development
On Mon, 2004-11-08 at 09:41 +0100, Geert Uytterhoeven wrote:
> Hi Larry,
>
> Would it be possible to enable the `-p' option (Show which C function each
> change is in) of diff for all patches sent to the bk-commits-* mailing lists?
I did consider that but 'bk diffs -up' gives a context diff, not a
unified diff.
--
dwmw2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-08 15:51 ` David Woodhouse
@ 2004-11-08 16:16 ` Geert Uytterhoeven
2004-11-08 16:24 ` David Woodhouse
0 siblings, 1 reply; 9+ messages in thread
From: Geert Uytterhoeven @ 2004-11-08 16:16 UTC (permalink / raw)
To: David Woodhouse; +Cc: Larry McVoy, Linux Kernel Development
On Mon, 8 Nov 2004, David Woodhouse wrote:
> On Mon, 2004-11-08 at 09:41 +0100, Geert Uytterhoeven wrote:
> > Would it be possible to enable the `-p' option (Show which C function each
> > change is in) of diff for all patches sent to the bk-commits-* mailing lists?
>
> I did consider that but 'bk diffs -up' gives a context diff, not a
> unified diff.
So it's a `regression' of bk diffs vs. GNU diff?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-08 16:16 ` Geert Uytterhoeven
@ 2004-11-08 16:24 ` David Woodhouse
0 siblings, 0 replies; 9+ messages in thread
From: David Woodhouse @ 2004-11-08 16:24 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Larry McVoy, Linux Kernel Development
On Mon, 2004-11-08 at 17:16 +0100, Geert Uytterhoeven wrote:
> On Mon, 8 Nov 2004, David Woodhouse wrote:
> > On Mon, 2004-11-08 at 09:41 +0100, Geert Uytterhoeven wrote:
> > > Would it be possible to enable the `-p' option (Show which C function each
> > > change is in) of diff for all patches sent to the bk-commits-* mailing lists?
> >
> > I did consider that but 'bk diffs -up' gives a context diff, not a
> > unified diff.
>
> So it's a `regression' of bk diffs vs. GNU diff?
Possibly. Certainly it's the reason my export scripts don't use -p. If
it's deemed a bug and once it's 'fixed' on kernel.org, we can change
that.
--
dwmw2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-08 8:41 bk-commits: diff -p? Geert Uytterhoeven
2004-11-08 15:51 ` David Woodhouse
@ 2004-11-08 16:43 ` Larry McVoy
2004-11-09 23:41 ` David Woodhouse
2004-11-10 8:49 ` Jens Axboe
1 sibling, 2 replies; 9+ messages in thread
From: Larry McVoy @ 2004-11-08 16:43 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Larry McVoy, Linux Kernel Development
This has been fixed in the following releases:
bk-3.2.3
bk-3.2.2c
bk-3.2.2b
Correct usage is "bk diffs -up" which will get you unified + procedural diffs.
-p is currently a hack, it implies -u, but don't depend on that behaviour,
a future release does this correctly and if you teach your fingers that
diffs -p is the same as diffs -up you'll get burned later.
On Mon, Nov 08, 2004 at 09:41:56AM +0100, Geert Uytterhoeven wrote:
> Hi Larry,
>
> Would it be possible to enable the `-p' option (Show which C function each
> change is in) of diff for all patches sent to the bk-commits-* mailing lists?
>
> Thanks!
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
--
---
Larry McVoy lm at bitmover.com http://www.bitkeeper.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-08 16:43 ` Larry McVoy
@ 2004-11-09 23:41 ` David Woodhouse
2004-11-10 15:06 ` Larry McVoy
2004-11-10 8:49 ` Jens Axboe
1 sibling, 1 reply; 9+ messages in thread
From: David Woodhouse @ 2004-11-09 23:41 UTC (permalink / raw)
To: Larry McVoy; +Cc: Geert Uytterhoeven, Linux Kernel Development
On Mon, 2004-11-08 at 08:43 -0800, Larry McVoy wrote:
> This has been fixed in the following releases:
>
> bk-3.2.3
> bk-3.2.2c
> bk-3.2.2b
>
> Correct usage is "bk diffs -up" which will get you unified + procedural diffs.
> -p is currently a hack, it implies -u, but don't depend on that behaviour,
> a future release does this correctly and if you teach your fingers that
> diffs -p is the same as diffs -up you'll get burned later.
Actually my script is using 'bk export -du -tpatch -r$CSET'. '-dup'
doesn't seem to do the right thing.
--
dwmw2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-08 16:43 ` Larry McVoy
2004-11-09 23:41 ` David Woodhouse
@ 2004-11-10 8:49 ` Jens Axboe
1 sibling, 0 replies; 9+ messages in thread
From: Jens Axboe @ 2004-11-10 8:49 UTC (permalink / raw)
To: Larry McVoy, Geert Uytterhoeven, Larry McVoy, Linux Kernel Development
On Mon, Nov 08 2004, Larry McVoy wrote:
> This has been fixed in the following releases:
>
> bk-3.2.3
> bk-3.2.2c
> bk-3.2.2b
>
> Correct usage is "bk diffs -up" which will get you unified + procedural diffs.
> -p is currently a hack, it implies -u, but don't depend on that behaviour,
> a future release does this correctly and if you teach your fingers that
> diffs -p is the same as diffs -up you'll get burned later.
Thanks! I requested this about a year ago :-)
--
Jens Axboe
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-09 23:41 ` David Woodhouse
@ 2004-11-10 15:06 ` Larry McVoy
2004-11-10 15:13 ` David Woodhouse
0 siblings, 1 reply; 9+ messages in thread
From: Larry McVoy @ 2004-11-10 15:06 UTC (permalink / raw)
To: David Woodhouse; +Cc: Larry McVoy, Geert Uytterhoeven, Linux Kernel Development
On Tue, Nov 09, 2004 at 11:41:52PM +0000, David Woodhouse wrote:
> On Mon, 2004-11-08 at 08:43 -0800, Larry McVoy wrote:
> > This has been fixed in the following releases:
> >
> > bk-3.2.3
> > bk-3.2.2c
> > bk-3.2.2b
> >
> > Correct usage is "bk diffs -up" which will get you unified + procedural diffs.
> > -p is currently a hack, it implies -u, but don't depend on that behaviour,
> > a future release does this correctly and if you teach your fingers that
> > diffs -p is the same as diffs -up you'll get burned later.
>
> Actually my script is using 'bk export -du -tpatch -r$CSET'. '-dup'
> doesn't seem to do the right thing.
OK, this is a hack but I think you can make it work. Try moving
`bk bin`/diff `bk bin`/diff.orig and putting in a shell
script for `bk bin`/diff that just adds $BK_GNU_DIFF_OPTS to the
options and execs `bk bin`/diff.orig
--
---
Larry McVoy lm at bitmover.com http://www.bitkeeper.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: bk-commits: diff -p?
2004-11-10 15:06 ` Larry McVoy
@ 2004-11-10 15:13 ` David Woodhouse
0 siblings, 0 replies; 9+ messages in thread
From: David Woodhouse @ 2004-11-10 15:13 UTC (permalink / raw)
To: Larry McVoy; +Cc: Geert Uytterhoeven, Linux Kernel Development
On Wed, 2004-11-10 at 07:06 -0800, Larry McVoy wrote:
> OK, this is a hack but I think you can make it work. Try moving
> `bk bin`/diff `bk bin`/diff.orig and putting in a shell
> script for `bk bin`/diff that just adds $BK_GNU_DIFF_OPTS to the
> options and execs `bk bin`/diff.orig
This would need to be done on kernel.org. Since it's a relatively low
priority, I think I'd rather wait for it to be fixed (if you're actually
going to fix it).
I suppose I could install my own version of BK, but I'd rather just
wait, to be honest.
--
dwmw2
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2004-11-10 15:18 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-11-08 8:41 bk-commits: diff -p? Geert Uytterhoeven
2004-11-08 15:51 ` David Woodhouse
2004-11-08 16:16 ` Geert Uytterhoeven
2004-11-08 16:24 ` David Woodhouse
2004-11-08 16:43 ` Larry McVoy
2004-11-09 23:41 ` David Woodhouse
2004-11-10 15:06 ` Larry McVoy
2004-11-10 15:13 ` David Woodhouse
2004-11-10 8:49 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.