# developing a modified Linux-style workflow 4 messages from 2010-12-12 to 2010-12-13. Participants: Hans-Christoph Steiner, David Aguilar, Neal Kreitzinger. Thread: https://gitlist.dev/t/26031 ## Hans-Christoph Steiner, 2010-12-12 22:24 Subject: developing a modified Linux-style workflow Message-ID: <7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C@at.or.at> URL: https://gitlist.dev/e/7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C%40at.or.at ``` Hey all, (and my second post on this list...) I've gotten pretty good at git, and its helping me already with managing the very odd workflows I have with the software I work a lot on called Pd (http://puredata.info). My role in Pd development is like a Linux lieutenant. I also the main dev for an app called Pd-extended, which is based on Pd. Now I'm stuck trying to figure out how to use git to match my current workflow for Pd-extended, which is a kind of long-lived branch, almost like a friendly fork. So its kind of close to the Linux workflow with me as a lieutenant, but not quite. What makes it tricky is that I make releases directly from my repo that are widely used. So my repo is both lieutenant and dictator at the same time. So that's where I am stumped. I want to be able to rebase and push to a public repo, but that would be stupid. So there has got to be another way. .hc ---------------------------------------------------------------------------- I have the audacity to believe that peoples everywhere can have three meals a day for their bodies, education and culture for their minds, and dignity, equality and freedom for their spirits. - Martin Luther King, Jr. ``` ## Hans-Christoph Steiner, 2010-12-13 03:23 Subject: Re: developing a modified Linux-style workflow Message-ID: URL: https://gitlist.dev/e/F24A90CB-3B3F-4B45-B638-7E262202CDF0%40at.or.at In-Reply-To: <20101213033145.GA3609@gmail.com> ``` On Dec 12, 2010, at 10:31 PM, David Aguilar wrote: > On Sun, Dec 12, 2010 at 05:24:16PM -0500, Hans-Christoph Steiner > wrote: >> >> Hey all, >> >> (and my second post on this list...) >> >> I've gotten pretty good at git, and its helping me already with >> managing the very odd workflows I have with the software I work a >> lot on called Pd (http://puredata.info). My role in Pd development >> is like a Linux lieutenant. >> >> I also the main dev for an app called Pd-extended, which is based on >> Pd. Now I'm stuck trying to figure out how to use git to match my >> current workflow for Pd-extended, which is a kind of long-lived >> branch, almost like a friendly fork. So its kind of close to the >> Linux workflow with me as a lieutenant, but not quite. >> >> What makes it tricky is that I make releases directly from my repo >> that are widely used. So my repo is both lieutenant and dictator at >> the same time. So that's where I am stumped. I want to be able to >> rebase and push to a public repo, but that would be stupid. So >> there has got to be another way. > > Have you considered periodically merging Pd into Pd-extended > as an alternative to rebasing? It might even be easier to > manage in the long-term. The thing I really like about the lieutenant workflow is that I can keep my patches at the top of history, and it automatically handles it once my patch is handled upstream. It seems that merging Pd into Pd- extended would leave me with a very complicated history. .hc ---------------------------------------------------------------------------- 'You people have such restrictive dress for women,’ she said, hobbling away in three inch heels and panty hose to finish out another pink- collar temp pool day. - “Hijab Scene #2", by Mohja Kahf ``` ## David Aguilar, 2010-12-13 03:31 Subject: Re: developing a modified Linux-style workflow Message-ID: <20101213033145.GA3609@gmail.com> URL: https://gitlist.dev/e/20101213033145.GA3609%40gmail.com In-Reply-To: <7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C@at.or.at> ``` On Sun, Dec 12, 2010 at 05:24:16PM -0500, Hans-Christoph Steiner wrote: > > Hey all, > > (and my second post on this list...) > > I've gotten pretty good at git, and its helping me already with > managing the very odd workflows I have with the software I work a > lot on called Pd (http://puredata.info). My role in Pd development > is like a Linux lieutenant. > > I also the main dev for an app called Pd-extended, which is based on > Pd. Now I'm stuck trying to figure out how to use git to match my > current workflow for Pd-extended, which is a kind of long-lived > branch, almost like a friendly fork. So its kind of close to the > Linux workflow with me as a lieutenant, but not quite. > > What makes it tricky is that I make releases directly from my repo > that are widely used. So my repo is both lieutenant and dictator at > the same time. So that's where I am stumped. I want to be able to > rebase and push to a public repo, but that would be stupid. So > there has got to be another way. Have you considered periodically merging Pd into Pd-extended as an alternative to rebasing? It might even be easier to manage in the long-term. -- David ``` ## Neal Kreitzinger, 2010-12-13 16:15 Subject: Re: developing a modified Linux-style workflow Message-ID: URL: https://gitlist.dev/e/ie5grt%24au2%241%40dough.gmane.org In-Reply-To: <7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C@at.or.at> ``` "Hans-Christoph Steiner" wrote in message news:7EAE16CF-A9A8-47A6-9294-3646CCDB0E9C@at.or.at... > > Hey all, > > (and my second post on this list...) > > I've gotten pretty good at git, and its helping me already with managing > the very odd workflows I have with the software I work a lot on called Pd > (http://puredata.info). My role in Pd development is like a Linux > lieutenant. > > I also the main dev for an app called Pd-extended, which is based on Pd. > Now I'm stuck trying to figure out how to use git to match my current > workflow for Pd-extended, which is a kind of long-lived branch, almost > like a friendly fork. So its kind of close to the Linux workflow with me > as a lieutenant, but not quite. > > What makes it tricky is that I make releases directly from my repo that > are widely used. So my repo is both lieutenant and dictator at the same > time. So that's where I am stumped. I want to be able to rebase and > push to a public repo, but that would be stupid. So there has got to be > another way. > > .hc > I don't think pushing to a public repo is stupid. You could create a bare repo with a Pd branch and Pd-extended branch that contain the production versions of Pd and Pd-extended. The main reason our shop chose git is because it allows us to easily have multiple concurrent versions of production by having a branch for each of our custom versions. These versions eventually get merged together into a major release, but in the meantime they are longlived branches representing the productional customized system for each major customer. *If* you end up merging Pd and Pd-extended at some point, then you could have another branch for that, e.g. master or Pd-master or whatever. BTW, you do not have to use master as the representative of your final merged work so don't think that is the way you HAVE to do it. It's just the default, and a common practice for systems with a single version of production. Master can become vestigial or secondary, if you choose to create a new branch called Pd-master, etc. to represent your eventual merges of Pd and Pd-extended. v/r, Neal ```