[Debian-med-packaging] picard-tools: please restart from a fresh git clone, sorry.

[olivier sallou]

Le 6 avr. 2014 03:43, "Charles Plessy" <plessy at debian.org> a écrit :
>
> Hello everybody,
>
> while updating picard-tools to version 1.109 some weeks ago, I ran
> git-import-orig without having updated my local upstream branch, and
> incorrectly placed git-buildpacakge "upstream" tags on the master branch,
which
> created some artificial conflicts during merges from later upstream
versions.
> To solve it, I had to replace the tags upstream/1.106 to upstream/1.109.
>
> You will have to delete these tags from your local repository, or start
your
> next work from a fresh clone, whichever is the simpler for you.  I
apologise
> for that extra work to you.  Please let me know if problems remain.
As you made the update for me (expected to do it soon), you are gladly
forgiven  :-)

Olivier
>
> Have a nice week-end,
>
> Charles
>
> --
> Charles Plessy
> Debian Med packaging team,
> http://www.debian.org/devel/debian-med
> Tsurumi, Kanagawa, Japan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-packaging/attachments/20140406/aad9008c/attachment.html>