Lobbying for -p1 diffs

Martin Pool mbp at sourcefrog.net
Thu Mar 2 04:20:57 GMT 2006


On 28 Feb 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:

> --- bzr.dev.1500/bzr
> +++ bzr-jam-integration.1483/bzr
> 
> > 
> >> I don't care whether we use ., -, {}, whatever to denote it.
> > 
> > Spot the arch user ;D
> > 
> > cheers
> 

> True enough, though technically, Martin was never truly an Arch user,
> and he *liked* and *used* {} to denote revision-ids. (If you look
> through the code, there are a lot of places where revision ids are
> formatted as "No revision id: {%s}" % (rev_id,).
> 
> So {} can exist outside of Arch. But yes, this one was from me. :)

Actually I was an arch (and then baz) user -- for example distcc is
published and maintained in arch.  (And still is, just because
I've done so few commits recently, but I will switch it someday.)

The {} for surrounding ids comes more from their occurrence in Microsoft
GUID forms, I think.  I just wanted some kind of quoting to set them off
from surrounding text.  I don't think they're very good in filenames
because of their meaning to the shell.

> The problem I specifically have with '.revno' is that it depends on how
> people name their branch. If they numbered by revision you would get:
> 
> --- bzr-0.7.1.1500/
> +++ bzr-0.8.1600/
> 
> (Actually, I think the above looks pretty cool, but if your revision
> numbers were low, it might be confusing whether the final number was an
> actual release number, or a revno)

Right, but as others say you can put it off to the right hand side of
the directory name.

I think it'd be good if the diff command showed the actual diff command
that was run, or just a slightly cleaned up form.

It would also be good if 'bzr diff' accepted a -p option and behaved
accordingly.

-- 
Martin
-------------- 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/20060302/380e49c4/attachment.pgp 


More information about the bazaar mailing list