Jan Djärv writes:
>
>
> Stephen J. Turnbull skrev 2010-08-21 20.59:
> > The workflow should be something like
> >
> > 0. work in "work", a branch of "mirror" (local) which is in turn
> > a branch of "trunk" (on Savannah)
> > 1. pull from "trunk" into "mirror"
> > 2. rebase "work" on "mirror"
> > 3. repeat 0-2 until done
> > 4. cd to mirror& pull from "work" into "mirror" (this will
> > always succeed!)
> > 5. push from "mirror" to "trunk"
> > 6. if 5 succeeds, you're done (for now, go to 0 to start the
> > next change)
> > 7. else pull --overwrite from "trunk" into "mirror"
> > 8. goto 2
>
> I do something similar, but 5 is a commit on a bound branch. Is
> there any difference between that and push?
Speaking very precisely, I think you must be doing something different
from what I think you mean. If "mirror" is a bound branch, then the
pull in step 4 will operate on "trunk" (ie, the Savannah mainline)
before operating on "mirror".