Why -p0 format patches?
John A Meinel
john at arbash-meinel.com
Mon Jul 11 15:07:33 BST 2005
Michael Ellerman wrote:
> Just a query, what was the reasoning behind "bzr diff" producing -p0 patches
> rather than -p1 patches? Because CVS/svn/.. do it?
> It's a bit of a pain for me, being used to -p1 format. And I notice now that
> changesets look like:
> --- BASEbzrlib/commands.py
> +++ TARGETbzrlib/commands.py
This is just a mistake/bug on my part. I was playing around with adding
labels and I forgot the separator.
> Which is kind of a hack, and would look nicer as:
> --- BASE/bzrlib/commands.py
> +++ TARGET/bzrlib/commands.py
Completely agreed, for now, I just removed it. I might bring it back.
> Just a thought. I guess it's too late now anyway.
I can't really say why -p0 instead of -p1. It would be pretty easy to
put "orig/" and "mod/" into the tree.
In fact, I believe the apply changeset code doesn't pay attention to
them anyway, since it only cares about the *** meta information line.
It is easy for me to add this into the current changeset code, is there
a general consensus as to which would be better?
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050711/54e23575/attachment.pgp
More information about the bazaar