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: Installing changes from branches Date: Sat, 03 Apr 2010 10:56:57 +0200 Message-ID: <4BB702D9.7000102@swipnet.se> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1270285048 27135 80.91.229.12 (3 Apr 2010 08:57:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 08:57:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 10:57:18 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 1NxzAI-00047w-M9 for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 10:57:14 +0200 Original-Received: from localhost ([127.0.0.1]:37652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxzAI-0006hY-2P for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 04:57:14 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxzAA-0006hT-9y for emacs-devel@gnu.org; Sat, 03 Apr 2010 04:57:06 -0400 Original-Received: from [140.186.70.92] (port=45351 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxzA7-0006hL-W1 for emacs-devel@gnu.org; Sat, 03 Apr 2010 04:57:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxzA6-0001Ct-Be for emacs-devel@gnu.org; Sat, 03 Apr 2010 04:57:03 -0400 Original-Received: from smtprelay-h21.telenor.se ([195.54.99.196]:43860) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxzA5-0001CX-V4 for emacs-devel@gnu.org; Sat, 03 Apr 2010 04:57:02 -0400 Original-Received: from ipb1.telenor.se (ipb1.telenor.se [195.54.127.164]) by smtprelay-h21.telenor.se (Postfix) with ESMTP id 84EF2CEFA for ; Sat, 3 Apr 2010 10:56:58 +0200 (CEST) X-SENDER-IP: [85.225.45.110] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AmU9AEOftktV4S1uPGdsb2JhbACHYpNoDAEBAQE1LbNPhQcE X-IronPort-AV: E=Sophos;i="4.51,356,1267398000"; d="scan'208";a="58745722" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb1.telenor.se with ESMTP; 03 Apr 2010 10:56:58 +0200 Original-Received: from [172.20.199.13] (zeplin [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 673887FA01A; Sat, 3 Apr 2010 10:56:57 +0200 (CEST) User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; sv-SE; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 In-Reply-To: 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:123106 Archived-At: Stefan Monnier skrev 2010-04-03 03.05: > I noticed recently that some people install small changes > from "quickfix branches" by something like: > > cd .../trunk > bzr merge .../quickfix > bzr commit ... > > This is fine if the quickfix has only a single commit or OTOH is a long > running branch with many different real commits. But not if the branch > has barely more than 1 real commit plus various "merge from trunk". > E.g.: > > revno: 99807 [merge] > committer: Jan D. > branch nick: trunk > timestamp: Fri 2010-04-02 11:46:07 +0200 > message: > * tmm.el (tmm-get-keymap): Check with symbolp before passing value to fboundp. > ------------------------------------------------------------ > revno: 99248.1.60 [merge] > committer: Jan D. > branch nick: fixes > timestamp: Fri 2010-04-02 11:45:27 +0200 > message: > Merge from trunk > ------------------------------------------------------------ > revno: 99248.1.59 > committer: Jan D. > branch nick: fixes > timestamp: Fri 2010-04-02 11:44:50 +0200 > message: > tmm.el (tmm-get-keymap): Check with symbolp before passing > value to fboundp, it may not be a symbol. > ------------------------------------------------------------ > revno: 99248.1.58 [merge] > committer: Jan D. > branch nick: fixes > timestamp: Thu 2010-04-01 08:50:44 +0200 > message: > Merge from trunk > ------------------------------------------------------------ > revno: 99248.1.57 [merge] > committer: Jan D. > branch nick: fixes > timestamp: Fri 2010-03-26 08:01:19 +0100 > message: > Merge from trunk > ------------------------------------------------------------ > revno: 99248.1.56 [merge] > committer: Jan D. > branch nick: fixes > timestamp: Tue 2010-03-23 20:32:31 +0100 > message: > Merge from trunk > ------------------------------------------------------------ > revno: 99248.1.55 [merge] > committer: Jan D. > branch nick: fixes > timestamp: Tue 2010-03-23 08:04:35 +0100 > message: > Merge from trunk > > [ Please Jan, don't take it personally, it's just an example. ] That is OK. I didn't even know comments got merged like this. Isn't the real problem that bzr requires a commit in the quickfix branch after a merge? If you are doing some work that takes time, I find it easier to merge from the trunk from time to time, rather than taking a big hit at the end. Something like a collapsed merge would be good, i.e. merge from quickfix, but only record it as a single commit. Jan D.