{"thread":{"id":"25990","subject":"Vendor branches workflow","startedAt":"2010-12-08T08:57:35Z","lastAt":"2010-12-08T21:54:27Z","messageCount":3,"participants":["Leonid Podolny","Jonathan Nieder","Neal Kreitzinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"157585","messageId":"AANLkTi=s9p3RycRCrocHEzfc4L-pnU6S9xCKfEL7TP=i@mail.gmail.com","threadId":"25990","inReplyTo":null,"subject":"Vendor branches workflow","fromName":"Leonid Podolny","fromEmail":"leonidp.lists@gmail.com","sentAt":"2010-12-08T08:57:35Z","receivedAt":"2010-12-08T08:57:35Z","isPatch":false,"sender":{"key":"leonidp.lists@gmail.com","avatar":null},"body":"Hi, list,\nI would like an advice on organizing a vendor branch workflow, to\nminimize the risk of it biting me in the future.\nIn our project, we have two upstreams, which are rather massively\npatched. One of the upstreams is an SF svn repository, the other\narrives in form of tgz's with sources. Now git is tracking the patched\nversion, and I want to add a vendor branch to simplify future vendor\ndrops.\nOut of the SVN upstream, we use only specific directories.\nSo, two questions:\n- How do I deal with unneeded directories? Do I filter them out before\ncommiting to the vendor branch or while merging the vendor branch into\nthe master?\n- Do you think it would be a good idea to keep .svn directories around\nat the vendor branch? (Kind of connected to the first question,\nbecause if I keep the .svn's, I will also have to keep the unneeded\ndirs).\n"},{"id":"157586","messageId":"20101208090908.GA4640@burratino","threadId":"25990","inReplyTo":"AANLkTi=s9p3RycRCrocHEzfc4L-pnU6S9xCKfEL7TP=i@mail.gmail.com","subject":"Re: Vendor branches workflow","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-12-08T09:09:08Z","receivedAt":"2010-12-08T09:09:08Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi Leonid,\n\nLeonid Podolny wrote:\n\n> In our project, we have two upstreams, which are rather massively\n> patched. One of the upstreams is an SF svn repository, the other\n> arrives in form of tgz's with sources. Now git is tracking the patched\n> version, and I want to add a vendor branch to simplify future vendor\n> drops.\n>\n> Out of the SVN upstream, we use only specific directories.\n\nIf I were in this situation, I would use \"git svn\" with its\nignore-paths option.  Like so:\n\n\tgit svn -Rsvn init --ignore-paths='^(?!directory-a|directory-b)' \\\n\t\t$url/trunk\n\nThis way, using \"git svn fetch\" causes the history of these files to\nbe fetched, and one can use gitk, git log -S, git bisect, and other\nfamiliar tools to browse through it.\n\nAlternatively, a more usual vendor branch workflow (manually\ncommitting the relevant files) can work well, too.  In either case I\nwould only track the upstream files relevant to the history of my\nproject.  A .gitignore file can be useful to avoid accidentally\ntracking other files (like the .svn metadata).\n\nHope that helps,\nJonathan\n"},{"id":"157632","messageId":"idoura$f8u$1@dough.gmane.org","threadId":"25990","inReplyTo":"AANLkTi=s9p3RycRCrocHEzfc4L-pnU6S9xCKfEL7TP=i@mail.gmail.com","subject":"Re: Vendor branches workflow","fromName":"Neal Kreitzinger","fromEmail":"neal@rsss.com","sentAt":"2010-12-08T21:54:27Z","receivedAt":"2010-12-08T21:54:27Z","isPatch":false,"sender":{"key":"neal@rsss.com","avatar":null},"body":"\"Leonid Podolny\" <leonidp.lists@gmail.com> wrote in message \nnews:AANLkTi=s9p3RycRCrocHEzfc4L-pnU6S9xCKfEL7TP=i@mail.gmail.com...\n> Hi, list,\n> I would like an advice on organizing a vendor branch workflow, to\n> minimize the risk of it biting me in the future.\n> In our project, we have two upstreams, which are rather massively\n> patched. One of the upstreams is an SF svn repository, the other\n> arrives in form of tgz's with sources. Now git is tracking the patched\n> version, and I want to add a vendor branch to simplify future vendor\n> drops.\n> Out of the SVN upstream, we use only specific directories.\n> So, two questions:\n> - How do I deal with unneeded directories? Do I filter them out before\n> commiting to the vendor branch or while merging the vendor branch into\n> the master?\n> - Do you think it would be a good idea to keep .svn directories around\n> at the vendor branch? (Kind of connected to the first question,\n> because if I keep the .svn's, I will also have to keep the unneeded\n> dirs).\n\nThe git-rm manpage explains a methodology for vendor branches.  Maybe you've \nalready read it...\n\nv/r,\nNeal \n"}]}