Potential issue when using dgit for DPMT modules
Hello,
This is just a heads-up for a potential issue that you may encounter
when you attempt to use dgit for a DPMT module (bug 850005).
If an attempt to do "dgit --dpm build-source" fails with something like:
,----
| $ dgit --dpm --clean=git build-source
| Format `3.0 (quilt)', need to check/update patch stack
| examining quilt state (multiple patches, dpm mode)
| dgit: split brain (separate dgit view) may be needed (--quilt=dpm).
| dgit: base trees orig=c8ab943f37df17d83f09 o+d/p=9e2aab849fc3a861ab5a
| dgit: quilt differences: src: ## orig ## gitignores: == orig ==
| dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p
| dgit: --quilt=dpm specified, implying patches-applied git tree
| dgit: but git tree differs from result of applying debian/patches to upstream
`----
Then the problem might be that some files that are present in the
upstream branch are not present in the master branch, but the deletion
has not been recorded in the patched branch.
In the case of python-llfuse, the missing files were:
$ git diff --stat 9e2aab849fc3a861ab5a..HEAD^ | grep -v " debian"
src/llfuse.egg-info/PKG-INFO | 80 ---------------------
src/llfuse.egg-info/SOURCES.txt | 108 ----------------------------
src/llfuse.egg-info/dependency_links.txt | 1 -
src/llfuse.egg-info/requires.txt | 1 -
src/llfuse.egg-info/top_level.txt | 1 -
src/llfuse.egg-info/zip-safe | 1 -
24 files changed, 93 insertions(+), 192 deletions(-)
In this case, the files were removed in commit 2d78b, which is the
"merge patched into master" commit generated by git-dpm.
In general, however, git-dpm seems to handle removals in the patched
branch just fine, so I suspect that this problem is either an artifact
of the import from svn-buildpackage, or I may have manually amended the
merge commit and now forgot about it.
In the former case, other packages that were batch converted from SVN
may have a similar problem.
Best,
-Nikolaus
--
GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F
»Time flies like an arrow, fruit flies like a Banana.«
Reply to: