[Pkg-fonts-devel] fontforge packaging in git: caveats, instructions, good news, and next steps

[Daniel Kahn Gillmor]

On 03/12/2012 01:20 AM, Martin Erik Werner wrote:
> I'd do the git bit something like this, for setting up and working with
> the upstream tracking after clone:
>
> git clone git://git.debian.org/pkg-fonts/fontforge.git
> # or  git clone ssh+git://git.debian.org/git/pkg-fonts/fontforge.git
> git remote add ff-upstream
> git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge
> git fetch ff-upstream
>
> git checkout upstream
> git branch --set-upstream upstream ff-upstream/master
> git pull
>
> git checkout upstream-cleaned
> git merge -s ours upstream
> # merge strategy 'ours' should ensure that when upstream have changes to
> # the files we deleted, the merge conflict is resolved in the favour of
> # our deletion
> git tag fontforge/0.0.$(date +%Y%m%d)+git
>
> git checkout master
> git merge upstream-cleaned
> dch -i
> git commit -am"Update changelog"
> git-buildpackage

This is much nicer than what i had, thanks!  I'll be using this approach 
for future work if the team decides to go with this arrangement.

> !!! A big word of warning when you are pushing the upstream commits into
> alioth and have commit-announces to pkg-fonts-commits enabled:
> Commit announces' "From:" field is based on the committer's email, and
> will bounce back to this email if it is not subscribed to the list. So
> if you push 2543 commits from upstream fontforge to alioth, you may end
> up with an equivalent amount of bounce emails sent to said upstream
> committers (yes, I found this out the bad way). The way around this is
> to temporarily disable these announces when you push stuff that's on the
> 'upstream' branch (in this case).

Yikes -- i hope i didn't just do that.  I thought i'd checked that all 
the hooks were turned off!

Indeed, it looks like we have no hooks (unless i'm misunderstanding 
something):

>> 0 dkg at vasks:~$ ls -l /git/pkg-fonts/fontforge.git/hooks/
>> total 44
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts  452 Apr 23  2010 applypatch-msg.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts  894 Apr 23  2010 commit-msg.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts  160 Apr 23  2010 post-commit.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts  552 Apr 23  2010 post-receive.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts  189 Apr 23  2010 post-update.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts  398 Apr 23  2010 pre-applypatch.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts 1567 Apr 23  2010 pre-commit.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts 1219 Apr 23  2010 prepare-commit-msg.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts 4942 Apr 23  2010 pre-rebase.sample
>> -rwxrwxr-x+ 1 rbrito-guest scm_pkg-fonts 3609 Apr 23  2010 update.sample
>> 0 dkg at vasks:~$

I have no plan to enable a commit hook that pushes to pkg-fonts-commits 
either, unless other folks on the team want to see that happen.

What do other pkg-fonts folks want here?

	--dkg