<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> </head> <body bgcolor="#ffffff" text="#000000"> 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. <blockquote><tt>k9m:src brendan$ bzr diff Makefile </tt> <tt>=== modified file 'src/Makefile'</tt> <tt>--- src/Makefile 2011-01-13 10:02:56 +0000</tt> <tt>+++ src/Makefile 2011-03-06 09:55:59 +0000</tt> <tt>@@ -3,7 +3,7 @@</tt> <tt> </tt> <tt> ### FIXME: need to generate a Python file for the version number to imported.</tt> <tt> ### FIXME: see xxx.py</tt> <tt>-APP_VER := 5.6.9</tt> <tt>+APP_VER := 5.6.9.1</tt> </blockquote> <tt> 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. </tt> <blockquote><tt>$ bzr log --forward | tail</tt> <tt>------------------------------------------------------------</tt> <tt>revno: 200</tt> <tt>committer: Brendan Simon <a class="moz-txt-link-rfc2396E" href="mailto:brendan.simon@etrix.com.au"><brendan.simon@etrix.com.au></a></tt> <tt>branch nick: XXX-v5.6</tt> <tt>timestamp: Sun 2011-01-16 09:51:51 +1100</tt> <tt>message:</tt> <tt> * Change version to 5.6.10-rc1.</tt> <tt>------------------------------------------------------------</tt> <tt>Use --include-merges or -n0 to see merged revisions. </tt></blockquote> And if I diff that last changeset, bzr tells me that it was indeed changed to 5.6.10-rc1. <blockquote><tt> </tt><tt>k9m:src brendan$ bzr diff -c 200 Makefile </tt> <tt>=== modified file 'src/Makefile'</tt> <tt>--- src/Makefile 2011-01-13 10:02:56 +0000</tt> <tt>+++ src/Makefile 2011-01-15 22:51:51 +0000</tt> <tt>@@ -3,7 +3,7 @@</tt> <tt> </tt> <tt> ### FIXME: need to generate a Python file for the version number to imported.</tt> <tt> ### FIXME: see xxx.py</tt> <tt>-APP_VER := 5.6.9</tt> <tt>+APP_VER := 5.6.10-rc1</tt> <tt> </tt> <tt> APP_NAME := XXX</tt><tt></tt> </blockquote> 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. Any clues as to what is going on ??? Thanks, Brendan. </body> </html>