From: Larry McVoy <lm@bitmover.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: Larry McVoy <lm@bitmover.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: Re: bk-commits: diff -p?
Date: Wed, 10 Nov 2004 07:06:47 -0800 [thread overview]
Message-ID: <20041110150646.GA10537@work.bitmover.com> (raw)
In-Reply-To: <1100043712.21273.26.camel@baythorne.infradead.org>
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
next prev parent reply other threads:[~2004-11-10 15:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2004-11-10 15:13 ` David Woodhouse
2004-11-10 8:49 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041110150646.GA10537@work.bitmover.com \
--to=lm@bitmover.com \
--cc=dwmw2@infradead.org \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.