diff handling of filters?

Robert Collins robert.collins at canonical.com
Tue Mar 31 23:24:48 BST 2009


On Tue, 2009-03-31 at 21:57 +0200, Jelmer Vernooij wrote:
> On Tue, Mar 31, 2009 at 08:49:09AM +1000, Ian Clatworthy wrote:
> > Jelmer Vernooij wrote:
> > > Is it correct that a "bzr diff" of the working tree against the last
> > > revision in the repository doesn't appear to compress the keywords in
> > > the working tree while diffing?
> > bzr diff should be diffing the basis tree against the canonical
> > (post read-filtered) form, not the convenience (WT) form.
> > External diff tools won't yet but internal bzr diff should.
> > If not, it's a bug. (diff needs to show what will get committed).
> I think I have a PEBKAC somewhere, but I'm not sure what I'm doing
> wrong. 
> 
> I have the following in ~/.bazaar/rules:
> 
> [name Portfile]
> svn-keywords = Id
> 
> "bzr.dev co" of a branch that contains a file named Portfile will not
> expand $Id$ in the working tree copy of Portfile.

You need a --development-wt5 or whatever its currently called - WT4
doesn't support filters.

-Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090401/e3dbcd55/attachment.pgp 


More information about the bazaar mailing list