Le mercredi 26 mai 2010 19:41:03, vous avez écrit : > package git-dpm > tag 583243 + pending > thanks > > * Thomas Preud'homme <thomas.preudho...@celest.fr> [100526 18:30]: > > 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) > > Thanks for your report. I hope that is fixed now in the git repository > at git://git.debian.org/git-dpm/git-dpm.git, a Debian package fixing > this will also come in the next days. (Or just add the missing -f in your > copy). > > > First, upstream branch contains a debian/ directory as upstream tarball > > does. > > I think this was the triggering problem. Git-dpm is removing the old > debian/ directory to replace it with the new one. At this state there > exists an HEAD (and working directory) with the debian branch and an index > with the patched branch. Then even when telling git to only process the > index it looks at the files in the working directory and is confused if > they differ. (I guess when I tested this mode I forgot to change some > files in the debian branch, so I did not get this error). > > Hochachtungsvoll, > Bernhard R. Link
It indeed fix the bug. I thought about trying this at one moment but I forgot after taking a look to the code. Thanks.
signature.asc
Description: This is a digitally signed message part.
