From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Bzr document unclear. There is no "conflict markers". Date: Sun, 03 Jan 2010 10:10:02 -0500 Message-ID: References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262531437 12238 80.91.229.12 (3 Jan 2010 15:10:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 15:10:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?B?SmFuIERqw6Rydg==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 03 16:10:30 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 1NRS64-00022N-7c for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 16:10:24 +0100 Original-Received: from localhost ([127.0.0.1]:50218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRS64-0000Kh-DC for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 10:10:24 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRS5z-0000KT-VO for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:10:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRS5v-0000Jz-Gb for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:10:19 -0500 Original-Received: from [199.232.76.173] (port=53642 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRS5v-0000Jt-AP for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:10:15 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:45061) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRS5u-0003XX-QS for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:10:14 -0500 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NRS5i-0001Oi-F8; Sun, 03 Jan 2010 10:10:02 -0500 In-reply-to: <4B40AACE.9020002@swipnet.se> (message from =?UTF-8?B?SmFuIERqw6Rydg==?= on Sun, 03 Jan 2010 15:33:50 +0100) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:119310 Archived-At: > Date: Sun, 03 Jan 2010 15:33:50 +0100 > From: Jan Djärv > CC: emacs-devel@gnu.org > > If I modify one file it just shows that as modified. I can't reproduce 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 uncommitted > 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). > 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 you are going to pollute a public repository. > Is there such a command? I don't know.