From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?Jan_Dj=E4rv?= Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Sun, 22 Aug 2010 19:10:48 +0200 Message-ID: <4C715A18.2040605@swipnet.se> References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> <83tymppj62.fsf@gnu.org> <871v9t8klf.fsf@uwakimon.sk.tsukuba.ac.jp> <83lj81pazq.fsf@gnu.org> <83aaogpcbu.fsf@gnu.org> <87vd737pxd.fsf@uwakimon.sk.tsukuba.ac.jp> <4C710651.8010203@swipnet.se> <87d3ta7ptu.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1282497084 30597 80.91.229.12 (22 Aug 2010 17:11:24 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 17:11:24 +0000 (UTC) Cc: Uday S Reddy , Eli Zaretskii , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 19:11:23 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OnE4k-0000v1-Km for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 19:11:18 +0200 Original-Received: from localhost ([127.0.0.1]:40794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnE4j-0001Ml-Ux for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 13:11:17 -0400 Original-Received: from [140.186.70.92] (port=40905 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnE4Z-0001KM-Av for emacs-devel@gnu.org; Sun, 22 Aug 2010 13:11:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnE4T-0004TI-TO for emacs-devel@gnu.org; Sun, 22 Aug 2010 13:11:07 -0400 Original-Received: from smtprelay-h31.telenor.se ([213.150.131.4]:42766) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnE4N-0004SN-Ji; Sun, 22 Aug 2010 13:10:55 -0400 Original-Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by smtprelay-h31.telenor.se (Postfix) with ESMTP id 708ABEA0D0; Sun, 22 Aug 2010 19:10:54 +0200 (CEST) X-SENDER-IP: [85.225.45.35] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AjQ3AAL3cExV4S0jPGdsb2JhbACHaZhLDAEBAQE1LbgYhTcE X-IronPort-AV: E=Sophos;i="4.56,253,1280700000"; d="scan'208";a="121335366" Original-Received: from c-232de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.35]) by ipb2.telenor.se with ESMTP; 22 Aug 2010 19:10:53 +0200 Original-Received: from [172.20.199.13] (zeplin [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 498457FA05A; Sun, 22 Aug 2010 19:10:53 +0200 (CEST) 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 In-Reply-To: <87d3ta7ptu.fsf@uwakimon.sk.tsukuba.ac.jp> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:129049 Archived-At: Stephen J. Turnbull skrev 2010-08-22 15.13: > Jan Dj=E4rv 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 tu= rn > > > 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". Ah, 4 would be merge from work to mirror.