Package: dgit Version: 8.1 Severity: minor Hello,
1) Make some changes to upstream files 2) Stage them 3) dgit --include-dirty build-source 4) Now you have uncommitted debian/patches, but ignore that, and instead commit your upstream changes 5) dgit sbuild (or whatever), and you get: Commit Debian 3.0 (quilt) metadata [dgit (8.1~bpo9+1) quilt-fixup] [master 2a77c266a] Commit Debian 3.0 (quilt) metadata 2 files changed, 41 insertions(+) create mode 100644 debian/patches/debian-changes create mode 100644 debian/patches/series error: The following untracked working tree files would be overwritten by merge: debian/patches/debian-changes debian/patches/series Please move or remove them before you merge. Aborting dgit: failed command: git pull --ff-only -q /home/spwhitton/src/git-annex/.git/dgit/unpack/work master dgit: error: subprocess failed with error exit status 1 dgit should probably bail out earlier rather than trying the `git pull` invocation. -- Sean Whitton
signature.asc
Description: PGP signature