On Mon, Mar 02, 2015 at 07:57:26PM +0100, Andreas Tille wrote: > is somebody able to reproduce the following: > > > gbp-clone ssh://git.debian.org/git/debian-med/fastaq.git > cd fastaq > uscan --verbose > ... fetches ../fastaq_3.2.0.orig.tar.gz > git import-orig --pristine-tar ../fastaq_3.2.0.orig.tar.gz > What is the upstream version? [3.2.0] > gbp:info: Importing > '/home/andreas/debian-maintain/alioth/debian-med_git/fastaq_3.2.0.orig.tar.gz' > to branch 'upstream'... > gbp:info: Source package is fastaq > gbp:info: Upstream version is 3.2.0 > pristine-tar: committed fastaq_3.2.0.orig.tar.gz.delta to branch pristine-tar > gbp:info: Merging to 'master' > gbp:error: Merge failed, please resolve. > > > After this the repository is messed up with a lot of changed, deleted > and new files, most of the files in debian/* vanished. > > I havn't experienced anything similar before. Your master branch contains changes in upstream files (commit 35b6b76c8a48c9e8702763abee5fef92c9dbc718), those changes conflict with the changes in the new upstream version.
$ git diff --stat a12e4b2e47b945db9e3dbfefc078de8837d32129 master debian/changelog | 6 ++++ debian/control | 5 --- debian/copyright | 2 +- debian/patches/delay-import-statements-for-manpage-creation.patch | 307 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------ debian/usage_to_man | 47 +++++++++++++++++++++++-- fastaq/tasks.py | 31 ++++++++--------- fastaq/tests/data/sequences_test_fastaq_to_quasr_primers.expected | 2 -- fastaq/tests/data/sequences_test_fastaq_to_quasr_primers.fa | 4 --- fastaq/tests/data/tasks_test_sequence_trim_1.fa | 24 +++++++++---- fastaq/tests/data/tasks_test_sequence_trim_1.trimmed.fa | 14 +++++--- fastaq/tests/data/tasks_test_sequence_trim_2.fa | 24 +++++++++---- fastaq/tests/data/tasks_test_sequence_trim_2.trimmed.fa | 14 +++++--- fastaq/tests/data/tasks_test_sequences_to_trim.fa | 8 ++--- fastaq/tests/tasks_test.py | 11 +----- scripts/fastaq_sequence_trim | 4 ++- scripts/fastaq_to_quasr_primers_file | 12 ------- setup.py | 2 +- 17 files changed, 300 insertions(+), 217 deletions(-) -- WBR, wRAR
signature.asc
Description: Digital signature
