Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git and usability

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Andrew <afrayedknot AT thefrayedknot.armory.com>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] git and usability
  • Date: Tue, 18 Jul 2006 08:19:33 -0700

On Tue, Jul 18, 2006 at 02:04:24PM +0200, Jaka Kranjc wrote:
> On Tuesday 18 July 2006 13:39, Ladislav Hagara wrote:
> > Seems Git Guide has not been changed from 2006-07-01.
> > I would really appreciate if I could find out some kiss info about
> > "integration, cherry-picking" from test (master) grimoire to stable-rc
> > and stable grimoire,
> git log # find the commit you want to integrate and its hash ($hash below)
> git checkout stable-rc # to get to the branch you want to modify
> git cherry-pick -e $hash# cherry-pick
> git checkout master # to get back

You want to actually have a local stable-rc branch (my-stable-rc)
in addition to upstream copy. Cherry pick to the local branch, push,
then fetches go into the upstream copy.

Submitting directly to an upstream copy is bad because if someone else
updates it, you cannot fetch updates. Git only does merging locally.

local "master" branch is to local "origin" branch
as "my-stable-rc" branch is to local "stable-rc" branch

origin and stable-rc are both exact copies of the upstream branches,
git fetching simply fast-forwards them.

A no-nonsense modification of above:

git log master # find hash
#first time
git checkout -b my-stable-rc stable-rc-0.5
# subsequent times
git checkout my-stable-rc
git cherry-pick #repeat as necessary
git push origin my-stable-rc:stable-rc-0.5 # note origin in that context is
# the upstream ssh url, not
# the branch called origin (yea
# I dont like it either :-) ).
git checkout master # or whatever

The main hurdle for git is getting past how they botched master and
origin to be the exact reverse of how things normally go.


--
_________________________________________________________________________
| Andrew D. Stitt | acedit at armory.com | astitt at sourcemage.org |
| irc: afrayedknot | Sorcery Team Lead | ftp://t.armory.com/ |
| 1024D/D39B096C | 76E4 728A 04EE 62B2 A09A 96D7 4D9E 239B D39B 096C |
-------------------------------------------------------------------------




Archive powered by MHonArc 2.6.24.

Top of Page