[Debian-med-packaging] Upgrading picard-tools

[olivier sallou]

Le dim. 13 mars 2016 07:43, Andreas Tille <andreas at an3as.eu> a écrit :

> 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?
>
> 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.

Olivier

Olivier

>
> Kind regards
>
>        Andreas.
>
> --
> http://fam-tille.de
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-packaging/attachments/20160313/539f2f5c/attachment.html>