Re: Vendor branches workflow
- From
- Neal Kreitzinger <neal@rsss.com>
- Date
- Dec 8, 2010, 21:54 UTC
- Message-ID
- <idoura$f8u$1@dough.gmane.org>
- In-Reply-To
- <AANLkTi=s9p3RycRCrocHEzfc4L-pnU6S9xCKfEL7TP=i@mail.gmail.com>
"Leonid Podolny" <leonidp.lists@gmail.com> wrote in message news:AANLkTi=s9p3RycRCrocHEzfc4L-pnU6S9xCKfEL7TP=i@mail.gmail.com...
Show 17 quoted lines
> Hi, list, > I would like an advice on organizing a vendor branch workflow, to > minimize the risk of it biting me in the future. > In our project, we have two upstreams, which are rather massively > patched. One of the upstreams is an SF svn repository, the other > arrives in form of tgz's with sources. Now git is tracking the patched > version, and I want to add a vendor branch to simplify future vendor > drops. > Out of the SVN upstream, we use only specific directories. > So, two questions: > - How do I deal with unneeded directories? Do I filter them out before > commiting to the vendor branch or while merging the vendor branch into > the master? > - Do you think it would be a good idea to keep .svn directories around > at the vendor branch? (Kind of connected to the first question, > because if I keep the .svn's, I will also have to keep the unneeded > dirs).
The git-rm manpage explains a methodology for vendor branches. Maybe you've already read it...
v/r, Neal