On Fri, 2007-06-08 at 12:49 -0500, John Griessen wrote: > Peter TB Brett wrote: > > > stg pull origin # Make sure your patches are up to date w.r.t. main > > # repository > > Is this a merge, but in a patch at a time way? After this, you test and if > good, the patches > are ready to apply to the equivalent of HEAD/main-branch?
This is like doing "cvs update" before you commit changes. It pulls changes made on remote repo you originally started from, and merges them with your local copy. The next step is flattening the stgit commits into separate git commits, which you then push back to the remote repo. This assumes you're working with stgit. Having been playing with it a limited amount of time, I think stgit is nice, but it also has a few gotchas like eating your patches if you perform certain operations from a sub-dir of your checkout. For the most part, people will be able to use vanilla "git", or (nicer) "cogito" (tools beginning with "cg-"), and still use a work flow quite close to that they would with CVS. Being able to "float" patch series around and keep them up-to-date on top of a changing remote repository is nice, but this is an extra probably best tackled after basic git mastery. Peter C _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
