On Jan 03 2017, Ian Jackson <ijack...@chiark.greenend.org.uk> wrote:
> Nikolaus Rath writes ("Re: Bug#850005: dgit push without dgit build-source"):
>> $ 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
>>
>> Adding -D gave a lot more output, but it didn't help me that much.
>>
>> Is there a way to see what differences dgit is concerned about? The
>> patches have been generated by git-dpm, so I believe they should match
>> exactly...
>
> The complaint is that your HEAD is not equal to the result of applying
> the patches. dgit creates an "orig + patches" tree itself, to check
> this. The `o+d/p' hash is a tree object.
>
> I think something like
> git diff --stat 9e2aab849fc3a861ab5a..HEAD
> may be informative.
Uh, that does not look good. It contains ... a ton of files and changes
that I won't even bother to paste here.
> Can you put your git branch, and any necessary origs, somewhere I can
> get at them ?
>
> Also feel free to spam me with the -D output, obviously.
Sure, they're in the python-modules repo. In the meantime, I already
uploaded with dput and added an extra commit after the upload. I hope
that doesn't mess up things further.
$ git clone git+ssh://git.debian.org/git/python-modules/packages/python-llfuse
$ cd python-llfuse
$ git checkout master^ # Go back to what I actually wanted to upload
$ pristine-tar checkout ../python-llfuse_1.1.1+dfsg.orig.tar.xz
$ dgit --dpm --clean=git -D build-source
+ git diff --quiet HEAD
+ git clean -xdf
Format `3.0 (quilt)', need to check/update patch stack
checking for vendor-specific debian/patches/debian.series (Dpkg::Vendor
`current vendor')
checking for vendor-specific debian/patches/debian.series ((base) distro being
accessed)
checking for vendor-specific debian/patches/debian.series ((nominal) distro
being accessed)
| git rev-parse 'HEAD~0'
=> `2951d61e9f622546aed0ce635567ac55aed0bcbd'
CD .git/dgit/unpack
examining quilt state (multiple patches, dpm mode)
QF linkorigs python-llfuse_1.1.1+dfsg.orig.tar.xz,
../../../../python-llfuse_1.1.1+dfsg.orig.tar.xz Y
+ env GZIP=-1n tar -zcf './python-llfuse_1.1.1+dfsg-~~DGITFAKE.debian.tar.gz'
-C ../../.. debian/source/format debian/rules debian/control debian/changelog
debian/patches debian/source/options debian/tests/control
dgit: split brain (separate dgit view) may be needed (--quilt=dpm).
splitbrain cachekey dgit 2.13 1.1.1+dfsg dpm
2951d61e9f622546aed0ce635567ac55aed0bcbd
4f460959da5b338b2e2cec1f3354bc08bab2e5a7ca5dd575e04468da42e64213
93d39267ff95633a2614535ab4187acdc80ab8816311267bc5ce6f822e1bfd87
|(probably) git log -g '--pretty=format:%H %gs' dgit-intern/quilt-cache
>(no reflog)
splitbrain cache miss
+ sh -ec 'exec dpkg-source --no-check --skip-patches -x fake.dsc >/dev/null'
CD fake
| find -name .git -prune -print0
+ git init -q
+ git config gc.auto 0
+ git add -Af .
| git write-tree
=> `c8ab943f37df17d83f097da06acd0578d3e32834'
fake orig tree object c8ab943f37df17d83f097da06acd0578d3e32834
CD ..
CD work
+ git init -q
+ git config gc.auto 0
+ git reset -q --hard 2951d61e9f622546aed0ce635567ac55aed0bcbd
CD ../fake
+ git add -Af .
| git write-tree
=> `9e2aab849fc3a861ab5adc57d23cbbc330d4912f'
fake o+d/p tree object c8ab943f37df17d83f097da06acd0578d3e32834
CD ../work
| git diff-tree -z -r c8ab943f37df17d83f097da06acd0578d3e32834
2951d61e9f622546aed0ce635567ac55aed0bcbd
=> `:000000 100644 0000000000000000000000000000000000000000
94f8b152b04847072bec12aa46663bb779ee110b A\x00debian/.git-dpm\x00:000000 100644
0000000000000000000000000000000000000000
10860562ff333c50faaa27dce1dd98d670d1b2ad A\x00debian/README.source\x00:000000
100644 0000000000000000000000000000000000000000
ec635144f60048986bc560c5576355344005e6e7 A\x00debian/compat\x00:000000 100644
0000000000000000000000000000000000000000
b1910b6f9e7da216a43a7047d08e7bd1ca61f37a A\x00debian/copyright\x00:000000
100644 0000000000000000000000000000000000000000
58d0b3f95acdf523f98308a029414298c5285fb5
A\x00debian/python-llfuse-dbg.lintian-overrides\x00:000000 100644
0000000000000000000000000000000000000000
7d088d9a422d685564868fb95fa7fe42d0dc471f
A\x00debian/python-llfuse-dbg.maintscript\x00:000000 100644
0000000000000000000000000000000000000000
ac7465f31ddd4345a5faa744ec0f9deca63c78f5
A\x00debian/python-llfuse-doc.doc-base\x00:000000 100644
0000000000000000000000000000000000000000
1eefda5d47076e32ed7d83faf3b38c2abbf8ab25
A\x00debian/python-llfuse-doc.docs\x00:000000 100644
0000000000000000000000000000000000000000
2629b19b9667d8cd1526f83e9c5819e3f4c2e374
A\x00debian/python-llfuse.lintian-overrides\x00:000000 100644
0000000000000000000000000000000000000000
fb2ce118ab4c92d517c542e4bf69c261550aafee A\x00debian/python.inv\x00:000000
100644 0000000000000000000000000000000000000000
135a1b3d849e75bd669f1c649b9d7f89d5c50e44
A\x00debian/python3-llfuse-dbg.lintian-overrides\x00:000000 100644
0000000000000000000000000000000000000000
695d94a24681fcb2c93f2f81e819a6e69aedc32c
A\x00debian/python3-llfuse-dbg.maintscript\x00:000000 100644
0000000000000000000000000000000000000000
589e946a0707a4b81e9f16af97dcfa067b252e06
A\x00debian/python3-llfuse.lintian-overrides\x00:000000 100644
0000000000000000000000000000000000000000
fb217db6baae3558711d2bfe4cafa582d18b8461
A\x00debian/source/include-binaries\x00:000000 100755
0000000000000000000000000000000000000000
7c962ef2543989e0faba8202dab2f1779ccb265d
A\x00debian/tests/upstream-standard\x00:000000 100755
0000000000000000000000000000000000000000
90c9458bccebd75d95f6e7411d2ab49142555572
A\x00debian/tests/upstream-with-fuse\x00:000000 100644
0000000000000000000000000000000000000000
d2ea3479194be78d8c38a80f86e6428acab0b709
A\x00debian/upstream-signing-key.pgp\x00:000000 100644
0000000000000000000000000000000000000000
8bf0ae4532d51157f2577c11f39ddd23317eea43 A\x00debian/watch\x00:100644 100644
2290db693c777ff31c85814f5aafc36a406a4dc4
f64251a19375d3e62d272b66fe765b67a5fa4b07 M\x00rst/conf.py\x00:100755 100755
353c05c843f339fde2d8b620d79f201c2805fe2e
16cc0353e953c9c7b558b9123b74c1cf3bef3169 M\x00setup.py\x00:100644 000000
d17145ed0c736dede4b8ba618afedb017be08e4a
0000000000000000000000000000000000000000
D\x00src/llfuse.egg-info/PKG-INFO\x00:100644 000000
3b729be98483d047c555ad1ebe79a4545f24d33f
0000000000000000000000000000000000000000
D\x00src/llfuse.egg-info/SOURCES.txt\x00:100644 000000
8b137891791fe96927ad78e64b0aad7bded08bdc
0000000000000000000000000000000000000000
D\x00src/llfuse.egg-info/dependency_links.txt\x00:100644 000000
03fdf8ed24f99c297b402190021f7c75f205a70f
0000000000000000000000000000000000000000
D\x00src/llfuse.egg-info/requires.txt\x00:100644 000000
5c808d4cb0dc2cb89331062e641ba838967e4961
0000000000000000000000000000000000000000
D\x00src/llfuse.egg-info/top_level.txt\x00:100644 000000
8b137891791fe96927ad78e64b0aad7bded08bdc
0000000000000000000000000000000000000000
D\x00src/llfuse.egg-info/zip-safe\x00:100644 100644
53a64a66925f16a04ce4606ea3f919dacb52834a
357aef830a62382e816f19db37473688d88ba972 M\x00src/llfuse.pyx\x00:100644 100644
c9498dfbe829dba1951979e88442b077dbf2d818
77ffe8cae5756728533e2f1d790b4f707cbf1490 M\x00src/misc.pxi\x00:100755 100755
81242e408e1f37d326a2e202247b873971499859
e2b37c6790779d8d8237d58cceca7694841b8b2f M\x00test/test_api.py\x00:100755
100755 707c72555d9ca64a52315bb09de2c0ddec9d787a
0e8f6cd5ae1ba098188f5d8bc4995a5cd1ac9b07 M\x00test/test_examples.py\x00:100755
100755 b6c25116dbe99c0d5338d9634391a278803d0f77
7bbd4190c7186e0d3499df4b77d88c1000489187 M\x00test/test_fs.py\x00:100644 100644
2e8fe3e55e80c198c4fbb5303287756be9f55bee
043fd919a799fd47b7a72c932b44d554717ddcfd M\x00test/util.py\x00'
quiltify_trees_differ c8ab943f37df17d83f097da06acd0578d3e32834
2951d61e9f622546aed0ce635567ac55aed0bcbd => 1
| git diff-tree -z --name-only -r 2951d61e9f622546aed0ce635567ac55aed0bcbd
9e2aab849fc3a861ab5adc57d23cbbc330d4912f
=>
`debian/.git-dpm\x00debian/README.source\x00debian/compat\x00debian/copyright\x00debian/python-llfuse-dbg.lintian-overrides\x00debian/python-llfuse-dbg.maintscript\x00debian/python-llfuse-doc.doc-base\x00debian/python-llfuse-doc.docs\x00debian/python-llfuse.lintian-overrides\x00debian/python.inv\x00debian/python3-llfuse-dbg.lintian-overrides\x00debian/python3-llfuse-dbg.maintscript\x00debian/python3-llfuse.lintian-overrides\x00debian/source/include-binaries\x00debian/tests/upstream-standard\x00debian/tests/upstream-with-fuse\x00debian/upstream-signing-key.pgp\x00debian/watch\x00src/llfuse.egg-info/PKG-INFO\x00src/llfuse.egg-info/SOURCES.txt\x00src/llfuse.egg-info/dependency_links.txt\x00src/llfuse.egg-info/requires.txt\x00src/llfuse.egg-info/top_level.txt\x00src/llfuse.egg-info/zip-safe\x00'
quiltify_trees_differ 2951d61e9f622546aed0ce635567ac55aed0bcbd
9e2aab849fc3a861ab5adc57d23cbbc330d4912f => 1
| git diff-tree -z --name-only -r c8ab943f37df17d83f097da06acd0578d3e32834
9e2aab849fc3a861ab5adc57d23cbbc330d4912f
=>
`rst/conf.py\x00setup.py\x00src/llfuse.pyx\x00src/misc.pxi\x00test/test_api.py\x00test/test_examples.py\x00test/test_fs.py\x00test/util.py\x00'
quiltify_trees_differ c8ab943f37df17d83f097da06acd0578d3e32834
9e2aab849fc3a861ab5adc57d23cbbc330d4912f => 1
differences @dl ## ## ## == == ==.
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
| date '+%s %z' -d 'Mon, 02 Jan 2017 20:17:51 -0800'
=> `1483417071 -0800'
dgit: --quilt=dpm specified, implying patches-applied git tree
dgit: but git tree differs from result of applying debian/patches to upstream
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.«
