Weird problem with bzr diff

[Jelmer Vernooij]

Hi Brendan,

On Tue, 2011-03-08 at 21:35 +1100, Brendan Simon (eTRIX) wrote:
> I have a problem with bzr diff which I'm struggling to understand.
> 
> I have changed a version number in a Makefile that is under version
> control.  I changed it from 5.6.9 to 5.6.9.1, but the 5.6.9 should
> have been 5.6.10-rc1.
> 
> "bzr diff Makefile" confirms that it thinks the previous version is
> 5.6.9.
> 
>         k9m:src brendan$ bzr diff Makefile 
>         === modified file 'src/Makefile'
>         --- src/Makefile    2011-01-13 10:02:56 +0000
>         +++ src/Makefile    2011-03-06 09:55:59 +0000
>         @@ -3,7 +3,7 @@
>          
>          ### FIXME: need to generate a Python file for the version
>         number to imported.
>          ### FIXME: see xxx.py
>         -APP_VER := 5.6.9
>         +APP_VER := 5.6.9.1
> 
> But if I look at the history of the branch I can see the last change
> was rev 200 with the comment stating the version was changed to
> 5.6.10-rc1.
> 
>         $ bzr log --forward | tail
>         ------------------------------------------------------------
>         revno: 200
>         committer: Brendan Simon <brendan.simon at etrix.com.au>
>         branch nick: XXX-v5.6
>         timestamp: Sun 2011-01-16 09:51:51 +1100
>         message:
>           * Change version to 5.6.10-rc1.
>         ------------------------------------------------------------
>         Use --include-merges or -n0 to see merged revisions.
> 
> And if I diff that last changeset, bzr tells me that it was indeed
> changed to 5.6.10-rc1.
> 
>         
>         k9m:src brendan$ bzr diff -c 200 Makefile 
>         === modified file 'src/Makefile'
>         --- src/Makefile    2011-01-13 10:02:56 +0000
>         +++ src/Makefile    2011-01-15 22:51:51 +0000
>         @@ -3,7 +3,7 @@
>          
>          ### FIXME: need to generate a Python file for the version
>         number to imported.
>          ### FIXME: see xxx.py
>         -APP_VER := 5.6.9
>         +APP_VER := 5.6.10-rc1
>          
>          APP_NAME := XXX
>  
> So now I'm confused.  What does 'bzr diff Makefile' and 'bzr diff -c
> <last-changeset> Makefile' give different results ??
> 
> I was using bzr 2.2.2 (OS X) and upgraded to 2.2.3 but the problem
> still exists.
Is your tree up to date ? You should be able to see this by running "bzr
revno" and "bzr revno --tree". The two revno's should be the same. If
they're not you can update your tree by running "bzr update".

Cheers,

Jelmer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110308/084d744f/attachment.pgp>