Re: bk-commits: diff -p?

Larry McVoy
2004-11-10T15:11:08Z

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