[MERGE] Bzr diff produces -p1 diffs

[Jan Hudec]

On Thu, Mar 02, 2006 at 16:59:06 +1100, Martin Pool wrote:
> On  1 Mar 2006, Michael Ellerman <michael at ellerman.id.au> wrote:
> > Hi fellas,
> > 
> > It seems there's a reasonable amount of support for -p1 diffs, so I
> > went and wrote the patch, it turned out to be _very_ simple. We could
> > probably use some more test coverage on this stuff.
> > 
> > For the moment I'm just using "a/" and "b/" as the diff headers. I
> > thought about "orig" and "mod", but that makes the filenames not line
> > up which looks ugly. We can do something fancier at a later date if
> > want to, but for 0.8 I think we just want to get the -p1-ness in
> > there. FWIW, both hg and git use a/ b/ also.
> 
> The patch looks fine, but -1 (veto) from me on making the -p1 behaviour
> unconditional, as this does.  I don't have a really strong opinion on
> which is the default but I think the -p0 behaviour should at least be
> available.
> 
> git and hg both come very much from the linux kernel community, and -p1
> style may be more common there than elsewhere.

Well, the idea is, that you can't really create a recursive -p0 diff
with plain diff and two trees. However it's true that many version
control systems generate -p0 diffs. But Arch generates -p1 ones and it
should be precedent for bzr, no?

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060306/16cfd617/attachment.pgp