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 15:33:50 +0100 Message-ID: <4B40AACE.9020002@swipnet.se> References: <4B40914B.4070203@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 1262529256 6685 80.91.229.12 (3 Jan 2010 14:34:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 14:34:16 +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 15:34:08 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 1NRRWv-0000Kb-Br for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 15:34:05 +0100 Original-Received: from localhost ([127.0.0.1]:35775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRRWv-0001ix-RK for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 09:34:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRRWq-0001iQ-JA for emacs-devel@gnu.org; Sun, 03 Jan 2010 09:34:00 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRRWk-0001hZ-UZ for emacs-devel@gnu.org; Sun, 03 Jan 2010 09:33:59 -0500 Original-Received: from [199.232.76.173] (port=37170 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRRWk-0001hW-Nc for emacs-devel@gnu.org; Sun, 03 Jan 2010 09:33:54 -0500 Original-Received: from proxy2.bredband.net ([195.54.101.72]:62721) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRRWi-0008Hk-Sh; Sun, 03 Jan 2010 09:33:53 -0500 Original-Received: from ipb1.telenor.se (195.54.127.164) by proxy2.bredband.net (7.3.140.3) id 4AD3E1BC021F3914; Sun, 3 Jan 2010 15:33:51 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ajc0AKc5QEtV4S1uPGdsb2JhbACBRIIbl1wBAQEBN6k0jBSBLYIuVgQ X-IronPort-AV: E=Sophos;i="4.47,492,1257116400"; d="scan'208";a="22729178" 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 15:33:51 +0100 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id 836387FA07B; Sun, 3 Jan 2010 15:33:50 +0100 (CET) User-Agent: Thunderbird 2.0.0.23 (X11/20090817) 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:119309 Archived-At: Eli Zaretskii skrev: >> Date: Sun, 03 Jan 2010 13:44:59 +0100 >> From: Jan Dj=C3=A4rv >> >> % bzr merge >> bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommit= ted=20 >> changes (See bzr status). >> >> If I do bzr status, almost the whole tree is listed as modified (excep= t files=20 >> added and removed and not version controlled). >> >> I certainly didn't modify all files, in fact I modified none. I just = tried to=20 >> sync from savannah before starting to modify files. Is this expected = =66rom=20 >> bzr? >=20 > No. Something is definitely wrong. The workflow described on the > wiki works for me without any changes, including in a feature branch > where there are real non-trivial changes wrt the trunk. >=20 > Perhaps you somehow did something wrong while creating the branch. I tried to follow the wiki, but it is of course possible. > If you start another branch, does "bzr status" show that all files are > modified, right after branching?=20 No. > If not, when does it start showing > modified files? >=20 If I modify one file it just shows that as modified. I can't reproduce t= he=20 original error. But it still doesn't show any conflict markers: % bzr merge bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommitted= =20 changes (See bzr status). I kind of expected merge to merge changes without me having to check in i= nto=20 the quickfix branch first. Is there such a command? Jan D. Jan D.