Package: dgit Version: 11.5 Severity: wishlist X-Debbugs-Cc: pk...@debian.org
Hey, In the absence of a better venue of asking this question (there seems to be no mailing list): I have an upstream repository that contains a two-parent merge for some reason (https://github.com/twosigma/nsncd, of all the things merging a CLA into the repository). dgit bails out with this: | Format `3.0 (quilt)', need to check/update patch stack | examining quilt state (multiple patches, linear mode) | git-debrebase: snag ignored (-funclean-ordering): packaging change (6228b52f9f4e1c847907651dcfa27a4003280538) follows upstream change (eg 2a5ff9d32c70a818044d26b007ec407a875d2374) | git-debrebase: snag ignored (-funclean-ordering): packaging change (b977d9b16db9bd6dcfc7f9f1e1831ea254d2df1d) follows upstream change (eg 44c81340420d2e993e7506f3144720862c56d77a) | git-debrebase: snag ignored (-funclean-mixed): found mixed upstream/packaging commit (ef3e287879586088e795a518977de87e65c6c2fd) | | git-debrebase: error: found unprocessable commit, cannot cope: general two-parent merge (e3de17c274315bab561664ac57e46472670545cf) | git-debrebase: Branch does not seem to be meant to be a git-debrebase branch? | git-debrebase: Wrong branch, or maybe you needed git-debrebase convert-from-*. | git-debrebase: | dgit: failed command: git-debrebase --noop-ok -funclean-mixed -funclean-ordering make-patches --quiet-would-amend | | dgit: error: subprocess failed with error exit status 255 I have so far forced an --anchor manually upon git-debrebase, which worked, but is also very tedious to pass everywhere. Is this something that will auto-fix itself on the next upstream release because dgit will properly discard the history pre the current upstream release? I was at least hoping that it would disappear with the first regular upload - but this did not happen. Is there something I can do for dgit to accept the current state of the repository as canonical up to the point where the Debian packaging was modified/forked off. The snags are upstream's prior packaging as found in the upstream repository, which does not seem to be uncommon to me either. The repo can be found on dgit as well as on [1]. Kind regards and thanks Philipp Kern [1] https://salsa.debian.org/Debian/nsncd
