Lobbying for -p1 diffs

[John Arbash Meinel]

Michael Ellerman wrote:
> On 2/28/06, Wouter van Heyst <larstiq at larstiq.dyndns.org> wrote:
>> On Mon, Feb 27, 2006 at 01:12:04PM +1100, Michael Ellerman wrote:
>>> On 2/27/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
>>>> Michael Ellerman wrote:
>>>>> Hi guys,
>>>>>
>>>>> I just thought I'd pipe up once more before 0.8 freezes, and lobby for
>>>>> diff producing -p1 format diffs.
>>>> What are your preferred prefixes then? 'mod/' and 'orig/'?
>>> I'd prefer branch-nick.org and branch-nick, eg:
>>>
>>> --- work.orig/arch/powerpc/kernel/setup-common.c
>>> +++ work/arch/powerpc/kernel/setup-common.c
>> Hmm, will branch nick work with "Aaron's integration" type nicks?
>> +1 on using -p1, just need to figure out sensible labels.
> 
> You're right, I forgot you could set branch nick to something
> arbitrary. With a nick like that it definitely wouldn't work, or at
> least you might be able to make patch accept it with appopriate
> escapes, but it'd look horrible, so that'd suck.
> 
> For the moment we can just use a/ b/ or orig/ mod/, the point is to
> make it -p1 before 0.8, we can retrofit nicks later if we can work out
> how to do it nicely.
> 
> cheers

Well, you could always just make it the last component of
WorkingTree.basedir/Branch.base. Those have to be a valid path.

If I read what you had correctly, you want to use

SOMETHING.orig/path/inside/branch
SOMETHING/path/inside/branch

Is that correct? You prefer the prefixes SOMETHING.orig and SOMETHING?

I was actually thinking, if it is available, we could use revision
numbers. so you would have 'work.1500/' and 'work.1501/' with fallbacks
to 'work.orig' and 'work.mod' if a revision number was not available.
(Say you diff'd against a merged revision, or for the working tree).

I don't care whether we use ., -, {}, whatever to denote it. I don't
think we want to use the revision id. But I think we can add just a
little bit of information that people might find useful.

(Unless it would just be confusing because my 'work' branch is at a
different revno than *your* 'work' branch)

John
=:->



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060228/a83ebb0a/attachment.pgp