Control: severity -1 minor
Control: retitle -1 want diffstat and docs ref in "mismatch" error message


I'm sorry that the error message is less useful than it could be.  IMO
it should:

 * Include a diffstat
 * Refer to dgit(7)
 * Tell you the object name of the reconstructed tree object,
   so that you can run `git diff' etc. yourself


I'll respond to your specific situation with some hopefully helpful
info:

Matthew Vernon writes ("Bug#809516: dgit: sbuild followed by push results in 
"perhaps you forgot to build" error"):
> I am trying to push a new version of rsbackup, which I am building with 
> sbuild; the previous upload was not done with dgit.

I have reproduced the problem.  The cause is that your git tree
contains changes against the .orig.tar.gz which cannot be represented
by dpkg-source.

Much of this is discussed in dgit(7) under these headings:

 FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - AUTOTOOLS ETC.
 FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC.


In your case I got the following diffstat:

 Makefile.in             |  820 -----------
 aclocal.m4              | 1454 --------------------
 autogen.sh              |    0
 config.aux/ar-lib       |  270 ----
 config.aux/compile      |  347 -----
 config.aux/config.guess | 1420 --------------------
 config.aux/config.sub   | 1799 -------------------------
 config.aux/depcomp      |  791 -----------
 config.aux/install-sh   |  527 --------
 config.aux/missing      |  215 ---
 config.aux/test-driver  |  139 --
 config.h.in             |   97 --
 configure               | 7239 
--------------------------------------------------------------------------------------------------
 doc/Makefile.in         |  533 --------
 doc/decay.pdf           |  Bin 107496 -> 0 bytes
 scripts/coverity        |    0
 scripts/systest         |    0
 src/Makefile.in         | 1510 ---------------------
 tests/Makefile.in       |  978 --------------
 tools/Makefile.in       |  927 -------------
 20 files changed, 19066 deletions(-)


I think there are three classes of problem file here:

 * autotools (as discussed in dgit(7))

 * doc/decay.pdf (as discussed in dgit(7))

 * The two files in scripts/ which are executable in git but
    non-executable in the tarball.  Upstream tarball build
    bug perhaps ?


I hope one of the options in dgit(7) is suitable.  Good luck.

Ian.

Reply via email to