grokmirror packaging notes
==========================

The 'master' branch is used to track upstream's master.

The 'debian' branch is used to track the Debian packaging.

Tracking upstream
-----------------

1. Pull changes from upstream onto the 'master' branch.

    $ git checkout master
    $ git pull --ff-only upstream master

2. Merge upstream changes onto the 'debian' branch.

    $ git checkout debian
    $ git merge --no-ff master

Initialization
--------------

1. A git repository was created on collab-maint.

    edmonds@chase{0}:~$ ssh git.debian.org
    edmonds@vasks:~$ umask 002
    edmonds@vasks:~$ cd /git/collab-maint/
    edmonds@vasks:/git/collab-maint$ ./setup-repository grokmirror 'Packaging for grokmirror'
    Initialized empty shared Git repository in /srv/git.debian.org/git/collab-maint/grokmirror.git/
    edmonds@vasks:/git/collab-maint$ 

2. The upstream grokmirror source was initially obtained via git from
<git://git.kernel.org/pub/scm/utils/grokmirror/grokmirror.git>.

    $ git clone git://git.kernel.org/pub/scm/utils/grokmirror/grokmirror.git

3. The 'origin' remote was renamed to 'upstream'.

    $ git remote rename origin upstream

4. The 'debian' remote was added.

    $ git remote add debian ssh://git.debian.org/git/collab-maint/grokmirror.git

5. The 'debian' branch was created.

    $ git checkout -b debian

6. Repository content initially pushed to collab-maint.

    $ git push --all -u debian

7. The Debian packaging was created in the debian/ directory and commited on
the 'debian' branch.

8. Debian changes pushed to collab-maint.

    $ git push --all
    $ git push --tags
