From: Philip Oakley <philipoakley@iee.org>
Date: Tue, 11 Jun 2013 18:43:11 GMT
Subject: Re: Tracking vendor release with Git
Message-ID: <32BB10B036234E0F9A6AFEF05C25880F@PhilipOakley>
In-Reply-To: <1370970410-7935-1-git-send-email-ydroneaud@opteya.com>

From: "Yann Droneaud" <ydroneaud@opteya.com>
Sent: Tuesday, June 11, 2013 6:06 PM
> Hi,
>
> I'm trying to setup a workflow to track vendor releases (upstream).
> Each new release are provided as an archive of source code, data,
> documentation, etc.
>
> For each vendor releases, fixes need to be applied before making them
> available to users (downstream).
>
> Seems to be a rather common use case, ...

Have you looked at the msysgit process that has to cope with upstream 
git ;-)

e.g. 
https://code.google.com/p/msysgit/source/browse/share/msysGit/merging-rebase.sh?name=python
https://github.com/msysgit/msysgit/blob/master/share/msysGit/merging-rebase.sh
and
https://github.com/msysgit/msysgit/blob/master/share/msysGit/rebasing-merge.sh

whereby the guys re-apply all the patches that haven't been accepted 
upstream, along with local fixups to get each new release working.

Philip