[Monotone-devel] Something wrong with mtn diff, with changes close to beginning of file?

[Bruce Stephens]

At work, we keep dependencies checked in (we build on some platforms
which can't easily generate dependencies automatically, so we've
always just checked them in).

Often, when I've used "mtn diff" to generate patches, the dependencies
fail to apply with GNU patch.

Here's an example hunk which fails:

#
# old_revision [d882ed2b1ee7fe5249ed037c9a8e773ebba61a3e]
#
# patch "isode/src/apps/ds/net/dsaplsnr/.depend.lib"
#  from [e2a627c8d57790ced5d8719de7341934fb6e9951]
#    to [0acb582220ee3cba95b23220fc64081241a80959]
#
============================================================
--- isode/src/apps/ds/net/dsaplsnr/.depend.lib  
e2a627c8d57790ced5d8719de7341934fb6e9951
+++ isode/src/apps/ds/net/dsaplsnr/.depend.lib  
0acb582220ee3cba95b23220fc64081241a80959
@@ -1,12 +1,14 @@ DSAP_Lsnr.o : ../../../../h/isode/asn1/I
 DSAP_Lsnr.o : ../../../../h/isode/asn1/AF-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/BAC-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/DAS-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/DO-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/DSAS-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/IF-types.h
+DSAP_Lsnr.o : ../../../../h/isode/asn1/PAC-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/UNIV-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/asn1.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/pepsy.h
+DSAP_Lsnr.o : ../../../../h/isode/authcon/authcon.h
 DSAP_Lsnr.o : ../../../../h/isode/base/compat.h
 DSAP_Lsnr.o : ../../../../h/isode/base/logging.h
 DSAP_Lsnr.o : ../../../../h/isode/base/messages.h

The version with --external applies fine.  It looks like this:

--- isode/src/apps/ds/net/dsaplsnr/.depend.lib  old
+++ isode/src/apps/ds/net/dsaplsnr/.depend.lib  new
@@ -4,9 +4,11 @@
 DSAP_Lsnr.o : ../../../../h/isode/asn1/DO-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/DSAS-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/IF-types.h
+DSAP_Lsnr.o : ../../../../h/isode/asn1/PAC-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/UNIV-types.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/asn1.h
 DSAP_Lsnr.o : ../../../../h/isode/asn1/pepsy.h
+DSAP_Lsnr.o : ../../../../h/isode/authcon/authcon.h
 DSAP_Lsnr.o : ../../../../h/isode/base/compat.h
 DSAP_Lsnr.o : ../../../../h/isode/base/logging.h
 DSAP_Lsnr.o : ../../../../h/isode/base/messages.h


I tried to reproduce it by inserting a line into net.venge.monotone's
README or ROADMAP, but I couldn't seem to get one that was actually
rejected.  What I *did* see is some that patch only applied with some
fuzz, which is clearly wrong: I'm applying on *exactly* the same
original text, so the patch ought to apply entirely cleanly.

Shall I report this as a bug, or is it obvious to someone what's
happened?  I'm guessing it's some off-by-one difference, but I can't
see what it is: both diffs look fine to me.