emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Locks on the Bzr repository


From: Jan Djärv
Subject: Re: Locks on the Bzr repository
Date: Sun, 22 Aug 2010 13:13:21 +0200
User-agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; sv-SE; rv:1.9.2.8) Gecko/20100802 Thunderbird/3.1.2



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?

        Jan D.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]