Package: git-dpm Version: 0.1.1-1 Severity: normal Tags: upstream After applying patches in patched branch, git-dpm fails with git saying some files has content different from both file and the HEAD. When launching in debug mode, I got this:
Make sure debian branch does not contain any additional changes... Merging the new patched branch into debian/ Switched to branch 'master' Create an index with files from 'patched'... Remove possible debian/ in patched... error: 'debian/changelog' has staged content different from both the file and the HEAD (use -f to force removal) error: 'debian/compat' has staged content different from both the file and the HEAD (use -f to force removal) error: 'debian/control' has staged content different from both the file and the HEAD (use -f to force removal) error: 'debian/copyright' has staged content different from both the file and the HEAD (use -f to force removal) error: 'debian/rules' has staged content different from both the file and the HEAD (use -f to force removal) error: 'debian/watch' has staged content different from both the file and the HEAD (use -f to force removal) Note that this repository is special in 2 ways. First, upstream branch contains a debian/ directory as upstream tarball does. Second, patches listed in debian/patches/series are already applied on upstream and merged in master manually. This alone can't be the reason as I also did it on another repository and it worked just fine. The command I launched is: git dpm init --create-no-patches --patches-applied <upstrean-tarball> upstream Best regards. -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (990, 'unstable'), (500, 'oldstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- debconf-show failed -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
