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: VC and bzr. Date: Thu, 22 Apr 2010 21:58:29 +0300 Message-ID: <83633j48mi.fsf@gnu.org> 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> 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: dough.gmane.org 1271962723 21805 80.91.229.12 (22 Apr 2010 18:58:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 18:58:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 22 20:58:42 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 1O51bl-0005Sg-Ui for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 20:58:42 +0200 Original-Received: from localhost ([127.0.0.1]:40978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O51bl-00035e-An for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 14:58:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O51be-00031C-Qi for emacs-devel@gnu.org; Thu, 22 Apr 2010 14:58:35 -0400 Original-Received: from [140.186.70.92] (port=40482 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O51bc-0002vs-Ei for emacs-devel@gnu.org; Thu, 22 Apr 2010 14:58:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O51ba-0008Kc-Ox for emacs-devel@gnu.org; Thu, 22 Apr 2010 14:58:32 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:48644) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O51ba-0008KU-H9 for emacs-devel@gnu.org; Thu, 22 Apr 2010 14:58:30 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0L1A00600KCJEF00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 22 Apr 2010 21:58:29 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.129.222]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L1A006IUKPGD420@a-mtaout22.012.net.il>; Thu, 22 Apr 2010 21:58:29 +0300 (IDT) In-reply-to: <871ve75t1e.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.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:124070 Archived-At: > From: =C3=93scar Fuentes > Date: Thu, 22 Apr 2010 18:52:13 +0200 >=20 > Both `bzr log' and `git log --first-parent' are screwed by the work= flow >=20 > merge from trunk into my feature branch > then, push to trunk Unless you work on a feature for a very long time (months), there should be no reasons for the "merge from trunk" part. For example, I committed a few days ago 3-weeks worth of development on a local branch, with no interim merges from mainline whatsoever. When I merged back to the trunk, before committing to repository, I had only 2 merge conflicts (one of them in ChangeLog, which cannot be avoided, but is trivially fixed). Perhaps we should modify the instructions on the wiki slightly, to make the workflow slightly less annoying due to frequent slow commits and at the same time avoid screwing up what "bzr log" shows on the mainline.