March 4th, 2008
I’m really liking this.
Each BTS patch gets a Git feature branch. My Git repo for this project has about 21 branches in it.
So, I pull upstream into a branch called, well, upstream.
Each feature branch is created off upstream.
Then, the master branch merges all the feature branches in. I wrote a simple git-merge-fb shell script that just runs git-merge for each feature branch. Very simple. I expect to have a git-pull-fb script of some sort that merges upstream into each feature branch when I update against upstream. It could also run a diff at the end to see if there is any difference remaining, and if not, delete the branch.
It’s trivial to give an updated diff to upstream for any given patch: git diff feature-blah..upstream will do it.
I only wish gitweb had a way to do that so I could just hand out a URL that always corresponds to the latest diff against upstream for a given feature. Now that would rock.