From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: VC and bzr. Date: Thu, 22 Apr 2010 21:47:15 +0200 Message-ID: <87ljcf46d8.fsf@telefonica.net> References: <4BCF45FA.1060808@swipnet.se> <4BCFDE02.5090808@swipnet.se> <4BD01AC9.1000200@swipnet.se> <4BD0395F.7040500@swipnet.se> <87eii7629z.fsf@telefonica.net> <87aasv5zsz.fsf@telefonica.net> <87633j5ya8.fsf@telefonica.net> <871ve75t1e.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1271966542 6039 80.91.229.12 (22 Apr 2010 20:02:22 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 20:02:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 22 22:02:21 2010 connect(): No such file or directory 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 1O52bH-0000gP-33 for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 22:02:15 +0200 Original-Received: from localhost ([127.0.0.1]:41109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O52bG-0000R1-HG for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 16:02:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O52N8-0008Am-LY for emacs-devel@gnu.org; Thu, 22 Apr 2010 15:47:38 -0400 Original-Received: from [140.186.70.92] (port=51897 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O52N7-00089W-5q for emacs-devel@gnu.org; Thu, 22 Apr 2010 15:47:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O52N5-0001c5-SK for emacs-devel@gnu.org; Thu, 22 Apr 2010 15:47:37 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:52154) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O52N5-0001by-L9 for emacs-devel@gnu.org; Thu, 22 Apr 2010 15:47:35 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1O52N0-0000ai-Fl for emacs-devel@gnu.org; Thu, 22 Apr 2010 21:47:30 +0200 Original-Received: from 83.42.12.8 ([83.42.12.8]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 22 Apr 2010 21:47:30 +0200 Original-Received: from ofv by 83.42.12.8 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 22 Apr 2010 21:47:30 +0200 X-Injected-Via-Gmane: http://gmane.org/ connect(): No such file or directory Original-Lines: 27 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.12.8 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:0zLY+Wc1xiXG903zeqNWQ1VZJ2c= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:124077 Archived-At: Andreas Schwab writes: >> merge from trunk into my feature branch >> then, push to trunk > > You should never use such a workflow, of course. Nobody is suggesting > that. So how shall I interpret this: Andreas Schwab writes: > "Jan D." writes: > >> Yes, I know I have a few local branches. But sometimes it has to go to >> savannah, or it will always be your private work. > > So push it when and only when it's ready. I read your advice as "use `bzr push'". Maybe by "push" you mean "commit" ? (The workflow described on the wiki is equivalent to pulling from trunk, not pushing into it, which makes a big difference on bzr because the special treatment it gives to the leftmost part of the DAG as discussed before.)