Bug#583243: git-dpm fails to init with upstream containing a debian/ directory

2010-05-26 Thread Thomas Preud'homme
Le mercredi 26 mai 2010 19:41:03, vous avez écrit : > package git-dpm > tag 583243 + pending > thanks > > * Thomas Preud'homme [100526 18:30]: > > Make sure debian branch does not contain any additional changes... > > Merging the new patched branch into debian/ > > Switched to branch 'master' > >

Bug#583243: git-dpm fails to init with upstream containing a debian/ directory

2010-05-26 Thread Bernhard R. Link
package git-dpm tag 583243 + pending thanks * Thomas Preud'homme [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

Bug#583243: git-dpm fails to init with upstream containing a debian/ directory

2010-05-26 Thread Thomas Preud'homme
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