bzr diff resulting in patchable diff

[Jack Andrews]

hi guys,
i've been using bzr to produce a set of patches for mysql.  basically,
i call 'bzr diff -r1' to produce the patches.  the problem is with
renames. eg:

$ bzr diff -r1 ndb/src/common/portlib/NdbDaemonOld.c  |head
=== renamed file 'ndb/src/common/portlib/NdbDaemon.c' =>
'ndb/src/common/portlib/NdbDaemonOld.c' (properties changed)
--- ndb/src/common/portlib/NdbDaemon.c  2007-08-29 07:25:53 +0000
+++ ndb/src/common/portlib/NdbDaemonOld.c       2007-11-27 05:32:15 +0000
@@ -21,78 +21,101 @@
 int NdbDaemon_ErrorCode = 0;
 char NdbDaemon_ErrorText[NdbDaemon_ErrorSize] = "";

+#ifdef NDB_WIN32
+#define F_ULOCK _LK_UNLCK
+#define F_LOCK _LK_LOCK


which patch does not like.

can i pass something to --diff-options so that i can generate a valid patch?

ta,  jack