[Debian-med-packaging] Upgrading picard-tools

[Andreas Tille]

On Sat, Mar 12, 2016 at 09:06:52PM +0900, Charles Plessy wrote:
> using the tool "gitk", I see a commit "Imported Upstream version 2.1.0+dfsg",
> in the master and the upstream branches.  However, such commit should only be
> in the upstream branch, and the master branch should have a merge commit such
> as "Merge tag 'upstream/xyz".  I do not know why this has accidently happened,
> but the result is that when you import version 2.1.1, git-buildpackage is now
> trying to merge the freshly created tag upstream/2.1.1+dfsg as if
> upstream/2.1.0+dfsg had not existed.
> 
> My gut feeling is that, from the master branch and before the import of release
> 2.1.1, runnign "git merge upstream/2.1.0" should solve your problem.

I tried several things.  I consider this try the "most promising one to
my understanding"
 
picard-tools(master) $ git reset c9f5b97355476b469ff44a562c769e95a5200fda --hard
HEAD ist jetzt bei c9f5b97 Imported Upstream version 2.1.0+dfsg
picard-tools(master) $ git merge upstream/2.1.0+dfsg
merge: upstream/2.1.0+dfsg - not something we can merge

Any idea what else might help?

Kind regards

       Andreas.

-- 
http://fam-tille.de