[Debian-med-packaging] Upgrading picard-tools

[Vincent Danjean]

Le 13/03/2016 07:52, olivier sallou a écrit :
> 
> Le dim. 13 mars 2016 07:43, Andreas Tille <andreas at an3as.eu <mailto:andreas at an3as.eu>> a écrit :
>     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?
> 
> Unfortunatly, i do not master debian git tools beyond basic/usual tasks, nor what should be done manually to match what git-builpackage and co expects... :-( 
> Maybe backuping current git repo, and trying doing new upstream stuff like a new git repo, and force merge. We would be back to a clean state
> Not the best idea, but a possible one.

  I'm coming back from vacations. I will look at this today.

  Vincent