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: Sun, 03 Jan 2010 20:17:44 +0100 Message-ID: <4B40ED58.7030403@swipnet.se> References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> 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 1262546287 21485 80.91.229.12 (3 Jan 2010 19:18:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 19:18:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 03 20:18:00 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 1NRVxf-0001GY-1C for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 20:18:00 +0100 Original-Received: from localhost ([127.0.0.1]:42955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRVxe-0003cY-Tb for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 14:17:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRVxa-0003bz-G0 for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:17:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRVxW-0003ZU-UE for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:17:54 -0500 Original-Received: from [199.232.76.173] (port=42705 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRVxW-0003ZR-Mm for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:17:50 -0500 Original-Received: from proxy3.bredband.net ([195.54.101.73]:42455) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRVxV-0003YL-1p; Sun, 03 Jan 2010 14:17:49 -0500 Original-Received: from ipb1.telenor.se (195.54.127.164) by proxy3.bredband.net (7.3.140.3) id 4AD3E1BA020E97DE; Sun, 3 Jan 2010 20:17:46 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AhRKAHJ8QEtV4S1uPGdsb2JhbACBRIIahFaTAwEBAQE3qTCMEYEsgi5WBA X-IronPort-AV: E=Sophos;i="4.47,493,1257116400"; d="scan'208";a="22803844" 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 Jan 2010 20:17:46 +0100 Original-Received: from [172.20.199.13] (zeplin [172.20.199.13]) by coolsville.localdomain (Postfix) with ESMTPSA id 1E7067FA07B; Sun, 3 Jan 2010 20:17:46 +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: 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:119319 Archived-At: Eli Zaretskii skrev 2010-01-03 16.10: >> Date: Sun, 03 Jan 2010 15:33:50 +0100 >> From: Jan Dj=C3=A4rv >> CC: emacs-devel@gnu.org >> >> If I modify one file it just shows that as modified. I can't reproduc= e the >> original error. But it still doesn't show any conflict markers: >> >> % bzr merge >> bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommit= ted >> changes (See bzr status). > > I see that as well when I have uncommitted changes on a branch, so > it's probably normal. Note that the wiki tells you to "bzr merge" > _before_ you start hacking. But you are right that this issue should > be more explicit; I will edit the wiki (unless someone more > knowledgeable points out where we both are mistaken). Great. > >> I kind of expected merge to merge changes without me having to check i= n 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 you > are going to pollute a public repository. There is the question of commit logs and Changelogs. There will be many = local=20 logs, and as I understood it from previous discussion, these will all=20 propagate to savannah when I push from trunk. Jan D.