From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?B?SmFuIERqw6Rydg==?= Newsgroups: gmane.emacs.devel Subject: Re: Bzr document unclear. There is no "conflict markers". Date: Mon, 04 Jan 2010 01:14:19 +0100 Message-ID: <4B4132DB.6000303@swipnet.se> References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <4B40ED58.7030403@swipnet.se> <831vi7dm7y.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: Quoted-Printable X-Trace: ger.gmane.org 1262564080 3801 80.91.229.12 (4 Jan 2010 00:14:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Jan 2010 00:14:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 04 01:14:33 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 1NRaaf-0001az-1I for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 01:14:33 +0100 Original-Received: from localhost ([127.0.0.1]:37233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRaaf-0000Bu-AK for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 19:14:33 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRaaa-0000Bp-IA for emacs-devel@gnu.org; Sun, 03 Jan 2010 19:14:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRaaV-0000BB-V2 for emacs-devel@gnu.org; Sun, 03 Jan 2010 19:14:28 -0500 Original-Received: from [199.232.76.173] (port=45124 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRaaV-0000B8-Rg for emacs-devel@gnu.org; Sun, 03 Jan 2010 19:14:23 -0500 Original-Received: from proxy1.bredband.net ([195.54.101.71]:46076) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRaaU-0002Kg-66; Sun, 03 Jan 2010 19:14:22 -0500 Original-Received: from ipb2.telenor.se (195.54.127.165) by proxy1.bredband.net (7.3.140.3) id 4AD3E1C0021DF39A; Mon, 4 Jan 2010 01:14:20 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ar5JAFvBQEtV4S1uPGdsb2JhbACBRIIahFaTDwEBAQE3qgiMJIEsgi5WBA X-IronPort-AV: E=Sophos;i="4.47,494,1257116400"; d="scan'208";a="22871594" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 04 Jan 2010 01:14:20 +0100 Original-Received: from [172.20.199.13] (zeplin [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 0E2D97FA07B; Mon, 4 Jan 2010 01:14:20 +0100 (CET) User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; sv-SE; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 In-Reply-To: <831vi7dm7y.fsf@gnu.org> X-detected-operating-system: by monty-python.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:119329 Archived-At: Eli Zaretskii skrev 2010-01-03 20.25: >> Date: Sun, 03 Jan 2010 20:17:44 +0100 >> From: Jan Dj=C3=A4rv >> CC: emacs-devel@gnu.org >> >>>> I kind of expected merge to merge changes without me having to check= in into >>>> the quickfix branch first. >>> >>> Why do you need that? It is so easy to uncommit on a local branch >>> that committing there shouldn't be a hard decision. It's not like yo= u >>> are going to pollute a public repository. >> >> There is the question of commit logs and Changelogs. There will be ma= ny local >> logs, and as I understood it from previous discussion, these will all >> propagate to savannah when I push from trunk. > > But pushing from trunk is another operation. "bzr merge" in the > branch merges latest changes from trunk _into_the_branch_, not the > other way around. When time comes to merge your branch into mainline, > you should say "bzr merge ../quickfixes" _from_the_trunk_. Only then > you need to worry about local logs etc. > > Or am I missing something? > Probably not. There has been so much discussion about workflows and such= so=20 it is a bit confusing. I'll just see what happens when the time comes. Jan D.