Dear Maintainer,

I try to build a package comming from here

gbp clone http://salsa.debian.org/science-team/hyperspy
origtargz
dgit  --gbp sbuild

which end up like this

$ dgit --gbp sbuild
Format `3.0 (quilt)', need to check/update patch stack
dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
examining quilt state (multiple patches, gbp mode)
dgit: base trees orig=4f3547c9556f7313400b o+d/p=4f3547c9556f7313400b
dgit: quilt differences: src:  ## orig ==     gitignores:  == orig ==
dgit: quilt differences:      HEAD ## o+d/p               HEAD == o+d/p

dgit: error: --quilt=gbp specified, implying patches-unapplied git tree
dgit:  but git tree differs from orig in upstream files.
dgit: For full diff showing the problem(s), type:
dgit:  git diff 4f3547c9556f7313400bf895d6a00bce3b8e6ee5 HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore'
dgit:
dgit:  ... debian/patches is missing; perhaps this is a patch queue branch?
picca@page:~/debian/science-team/hyperspy$  git diff 4f3547c9556f7313400bf895d6a00bce3b8e6ee5 HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore'
diff --git a/doc/make.bat b/doc/make.bat
index 08e5a3cdd..f9e22d429 100755
--- a/doc/make.bat
+++ b/doc/make.bat
@@ -1,157 +1,157 @@
-@ECHO OFF
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-       set SPHINXBUILD=sphinx-build
-)
-set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-if NOT "%PAPER%" == "" (

[...]


it seems to me that this is something related to the gitattributes.

$ cat .gitattributes
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
*.py diff=python
*.bat        eol=crlf
*.msa        eol=crlf
*.nsi        eol=crlf

I would like your advices in order to solve this issue.

I imported the sources with

gbp import-orig --uscan

thanks for considering

Fred

Picca Frédéric-Emmanuel writes ("Bug#1099741: dgit: does not work out of the box with the rosettasciio repository"):
...

That seems likely.

It seems like you are trying to base your work on upstream tarballs.
In that case, to work with dgit, your git objects must contain
precisely the same as the tarball - in this case, with crlf line endings.

I looked at doc/make.bat and the version in the git tree seems to have
nl line endings, even though the version in the Debian archive has
crlf line endings.

I conjecture that this tune

failed to defuse the gitattributes before doing the tarball import.

Ian.