gEDA-dev: Considering git

[Peter TB Brett]

On Friday 08 June 2007 18:00:15 John Griessen wrote:
> Peter Clifton wrote:
>   basically, it allows me to make a change /
>
> > fix, commit it, and keep working. Much much less fuss about keeping lots
> > of patches around, multiple CVS checkouts for different lines of work
> > etc..
>
> After a series of commits while offline, is it easy to send them one at a
> time to gEDA's main repository, (to get testing feedback)?

Yes; use stgit to manage your series of patches.

Once you're happy with a patch:

  stg goto <patchname>   # Pop any patches you don't want to commit yet
  cg-fetch origin        # Update your repo from the main repository
  stg pull origin        # Make sure your patches are up to date w.r.t. main
                         # repository
  stg commit             # Turn StGit patches into "proper" git commits
  cg-push origin         # Commit in the CVS sense of the word
  stg push -a            # Push other patches back onto the stack

The other way to show off your changes is to publish your repo on a webserver 
somewhere.  You don't necessarily need a full git daemon & web interface.  
The people who want to try out your changes just do something like:

  cg-branch-add jg-cool-feature git://www.johngriessen.com/jg.git#cool-feature

And then they can try out your stuff.

Then you can use a branch proper for your work, keeping it entirely separate 
from the main repository until you want to put it into the main repository, 
when you can:

  cg-fetch origin
  cg-switch origin
  cg-merge cool-feature
.... fix conflicts ....
  cg-push origin

HTH,

Peter

-- 
Fisher Society                              http://tinyurl.com/o39w2
CU Small-Bore Club                          http://tinyurl.com/mwrc9

      09f911029d74e35bd84156c5635688c0            peter-b.co.uk
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.seul.org/pipermail/geda-dev/attachments/20070608/0718a8cb/attachment.pgp