From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Workflow to accumulate individual changes? Date: Sat, 02 Jan 2010 11:10:14 +0200 Message-ID: <83skaoeutl.fsf@gnu.org> References: <87bphengwq.fsf@uwakimon.sk.tsukuba.ac.jp> <87y6khmand.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1262423560 11507 80.91.229.12 (2 Jan 2010 09:12:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 2 Jan 2010 09:12:40 +0000 (UTC) Cc: lekktu@gmail.com, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 02 10:12:32 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.50) id 1NR02A-0006Rs-5n for ged-emacs-devel@m.gmane.org; Sat, 02 Jan 2010 10:12:30 +0100 Original-Received: from localhost ([127.0.0.1]:33698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NR02A-0006w0-8B for ged-emacs-devel@m.gmane.org; Sat, 02 Jan 2010 04:12:30 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NR024-0006u2-J3 for emacs-devel@gnu.org; Sat, 02 Jan 2010 04:12:24 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NR01z-0006s4-PT for emacs-devel@gnu.org; Sat, 02 Jan 2010 04:12:23 -0500 Original-Received: from [199.232.76.173] (port=36651 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NR01z-0006rz-Mr for emacs-devel@gnu.org; Sat, 02 Jan 2010 04:12:19 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:50883) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NR01z-0002Qp-A0 for emacs-devel@gnu.org; Sat, 02 Jan 2010 04:12:19 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVM0020046UG600@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 02 Jan 2010 11:12:18 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVM000V848HML70@a-mtaout20.012.net.il>; Sat, 02 Jan 2010 11:12:17 +0200 (IST) In-reply-to: <87y6khmand.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:119265 Archived-At: > From: "Stephen J. Turnbull" > Date: Sat, 02 Jan 2010 12:46:30 +0900 > Cc: Emacs developers >=20 > bzr branch trunk build-test > cd build-test > make bootstrap > make test # if you like, but should be OK :-) > for i =3D 1 2 3; do > cd .. > bzr branch trunk fix$i > cd fix$i > # hack > bzr commit -m "fix$i" > cd ../build-test > bzr checkout ../fix$i > make # Look Ma, no 'bootstrap'! > make test > done What is the semantics of "bzr checkout ../fix$i" in this case? What does it do, exactly? Bazaar docs are not very clear on that, to say the least: Purpose: Create a new checkout of an existing branch. But fix$i is already an existing branch, and one with local changes, so this ``create'' seems not quite the right word here. Usage: bzr checkout [BRANCH_LOCATION] [TO_LOCATION] Description: If BRANCH_LOCATION is omitted, checkout will reconst= itute =09=09 a working tree for the branch found in =E2=80=98.=E2=80=99. =09=09 [...] =09=09 If the TO_LOCATION is omitted, the last component of the =09=09 BRANCH_LOCATION will be used. In other words, =E2=80=9Ccheckou= t =09=09 ../foo/bar=E2=80=9D will attempt to create ./bar. If the =09=09 BRANCH_LOCATION has no / or path separator embedded, =09=09 the TO_LOCATION is derived from the BRANCH_LOCATION =09=09 by stripping a leading scheme or drive identifier, if =09=09 any. For example, =E2=80=9Ccheckout lp:foo-bar=E2=80=9D will a= ttempt =09=09 to create ./foo-bar. Again, ``create ./bar'' sounds incorrect in the context of your suggestion. ``Reconstitute a working tree'', OTOH, sounds too obscur= e to help. So what does this "checkout" do in this case? (Btw, note the tricky convention regarding slashes, not for the faint of heart IMO.)