GIT problems for the "biber" package

[Danai SAE-HAN (韓達耐)]

Hi Gregor

So do you think the best way forward is to redo the Git repository
completely, and get rid of the intertwined trees altogether?

BR

-- 
Danai
On 8 Jul 2013 01:14, "gregor herrmann" <gregoa at debian.org> wrote:

> On Sun, 07 Jul 2013 20:06:01 +0800, Danai SAE-HAN (韓達耐) wrote:
>
> > However, in Git and gbp this is not so simple, it seems.  I tried to
> > import it with "git pull" and then manual import with
> > "gbp-import-orig" but each time I get lousy "Conflicts".
>
> Usually it's totally easy with "git-import-orig --uscan", or manually
> downloading the tarball and running gbp-import-orig.
>
> I suppose you got the conflicts because the repo was messed up before
> that; looking at the history it seems like upstream/1.5 was never
> merged into master.
> (gitk or tig show quite interesting "trees".)
>
> > That is
> > bizarre: only debian/ is maintained in the Debian Git repo, the rest
> > outside that folder should be unaffected.
>
> Ehm, I don't think so.
>
> > It still got screwed up, because dpkg-source is apparently confused
> > and wants me to create an extra Quilt patch with the same upstream
> > diff.  The poor fool.
>
> Hm, true.
> Well, the diff contains the conflicting files with all the conflict
> markers.
>
> And they are in master/HEAD ...
> Looks like this was a0ac1c2b0c7a87445c0b6136dbecd95072f39cd6.
>
> And now am at the end of my git wisdom, sorry.
>
> Cheers,
> gregor
>
> --
>  .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key
> 0xBB3A68018649AA06
>  : :' : Debian GNU/Linux user, admin, and developer  -
> http://www.debian.org/
>  `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation
> Europe
>    `-   NP: John Zorn: Kanah (Sparks)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-perl-maintainers/attachments/20130708/ce889af9/attachment-0001.html>