diff handling of filters?
jelmer at samba.org
Tue Mar 31 23:32:45 BST 2009
On Wed, Apr 01, 2009 at 12:28:43AM +0200, Jelmer Vernooij wrote:
> On Wed, Apr 01, 2009 at 09:24:48AM +1100, Robert Collins wrote:
> > 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.
> D'oh! PEBKAC indeed. Thanks for bearing with me :-)
Actually, looks like I spoke too soon. This does indeed fix "bzr
diff", but "bzr revert" still won't attempt to expand any keywords.
More information about the bazaar