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 17:18:06 +0200 Message-ID: <4BB75C2E.5010104@swipnet.se> References: <4BB702D9.7000102@swipnet.se> 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 1270307908 23431 80.91.229.12 (3 Apr 2010 15:18:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 15:18: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 17:18:24 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 1Ny578-0006EW-D7 for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 17:18:23 +0200 Original-Received: from localhost ([127.0.0.1]:60908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny576-0005ar-Kd for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 11:18:20 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ny570-0005al-NG for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:18:14 -0400 Original-Received: from [140.186.70.92] (port=46998 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny56x-0005ad-Sz for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:18:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ny56w-0000ov-GI for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:18:11 -0400 Original-Received: from smtprelay-h21.telenor.se ([195.54.99.196]:41896) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ny56w-0000og-2h for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:18:10 -0400 Original-Received: from ipb1.telenor.se (ipb1.telenor.se [195.54.127.164]) by smtprelay-h21.telenor.se (Postfix) with ESMTP id A8BE9EA610 for ; Sat, 3 Apr 2010 17:18:08 +0200 (CEST) X-SENDER-IP: [85.225.45.110] X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ai9GAI74tktV4S1uPGdsb2JhbACHY5NnDAEBAQE1LbVSgwUBggEE X-IronPort-AV: E=Sophos;i="4.51,356,1267398000"; d="scan'208";a="58795691" 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 17:18:08 +0200 Original-Received: from [172.20.199.13] (zeplin [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 784D07FA01A; Sat, 3 Apr 2010 17:18:07 +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:123127 Archived-At: Stefan Monnier skrev 2010-04-03 16.08: >> 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 bran= ch >> after a merge? > > Bzr doesn't require any such thing. You decided to commit, not bzr. It is what the wiki-page says, I'm only following orders :-). Anyway, I think bzr requires a commit before next merge. Maybe there is = some=20 --force option to circumvent that. > That's linked to the fact that you decided to use "merge" rather than > "pull", i.e. use a separate branch. > I just decided to follow the instructions on the wiki page, pull isn't=20 mentioned as an alternative there. >> 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. > > There are many different ways to do it. I suggested a few in the part > of the message you elided: > - "For such changes, it's a lot better to just take the diff from the > branch, apply to the trunk and commit". That's what I do, as a matt= er > of fact, and I have grown to like it, since this "diff&patch" is > a good opportunity to rework/cleanup the patch one last time before > committing it. > - "Or to use "bzr rebase" instead". > - "Another very good solution is to not use quickfix branches at all, b= ut > use shelves instead". Rebase sounds good. Doing diff and patch manually kind of feels like bzr= is=20 missing something. > >> Something like a collapsed merge would be good, i.e. merge from quickf= ix, >> but only record it as a single commit. > > Indeed, you can also do that: > > cd .../trunk > bzr merge .../quickfix > bzr revert --forget-merges > bzr commit ... > > that's virtually the same as "diff&patch": it forgets all about the > branch's history. But according to =D3scar Fuentes you must later overwrite your quickfix b= ranch=20 with a pull --overwrite. I assume you loose local history on the quickfi= x=20 branch then? It is all very confusing. Jan D.