[Pkg-clamav-devel] OK, is it just me?

[Stephen Gran]

Are there any git gurus lurking around?  I'm having trouble pulling the
new upstream version into git, and I think it's because upstream has
done some very wierd branching.  Basically, the ancestry of things is:

alioth:~sgran/clamav-devel is a git-svn pull of upstream's svn.
alioth:~sgran/clamav is the git clone of that, plus debian branches
alioth:/git/pkg-clamav/clamav.git is a git clone of ~sgran/clamav

So far, so good - gitk shows that the various branches are in fact
related.

I git clone ssh://git.debian.org/git/pkg-clamav/clamav.git, and then git
remote add ssh://git.debian.org/git/users/sgran/clamav-devel.  Great,
my local copy shows that they are related.  This shold work.

Then I checkout debian/unstable, and try to git merge
clamav-devel/tags/clamav-0.94 (yes, tags is bad - they should have
put it in branches), and it all blows up.  I think, from examining the
reflogs, that this seems to be because the tag appears to branch off
of the mainline development branch before the 0.93 branch did (which is
insane, but possible).  Am I doing this wrong?  Can anyone either make
it work or let me know what I should be doing instead?

Thanks,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran at debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20080903/26968f31/attachment.pgp