[MERGE] Bzr diff produces -p1 diffs
James Blackwell
jblack at merconline.com
Wed Mar 1 01:33:44 GMT 2006
Would you mind tossing up a diff? :)
On Wed, Mar 01, 2006 at 11:29:21AM +1100, Michael Ellerman 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.
>
> Anyway it's up here, revs 1560 and 1559:
> http://michael.ellerman.id.au/files/bzr/diffp1/
>
> cheers
--
My home page: <a href="http://jblack.linuxguru.net">James Blackwell</a>
Gnupg 06357400 F-print AAE4 8C76 58DA 5902 761D 247A 8A55 DA73 0635 7400
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060228/16738651/attachment.pgp
More information about the bazaar
mailing list