From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bojan Nikolic Newsgroups: gmane.emacs.devel Subject: Re: Bzr document unclear. There is no "conflict markers". Date: Sun, 03 Jan 2010 15:24:15 +0000 Message-ID: <87aawvi540.fsf@bnikolic.co.uk> 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 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262532306 14523 80.91.229.12 (3 Jan 2010 15:25:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 15:25:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 03 16:24:59 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 1NRSK6-0006PR-9F for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 16:24:54 +0100 Original-Received: from localhost ([127.0.0.1]:39612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRSK5-0007YS-UQ for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 10:24:54 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRSJz-0007Y3-OA for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:24:47 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRSJu-0007XL-2P for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:24:46 -0500 Original-Received: from [199.232.76.173] (port=45480 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRSJt-0007XI-TO for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:24:41 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:58292) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NRSJt-0008Id-DG for emacs-devel@gnu.org; Sun, 03 Jan 2010 10:24:41 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NRSJq-0006Kc-DH for emacs-devel@gnu.org; Sun, 03 Jan 2010 16:24:38 +0100 Original-Received: from cv-nat-a-61.cv.nrao.edu ([192.131.232.61]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Jan 2010 16:24:38 +0100 Original-Received: from bojan by cv-nat-a-61.cv.nrao.edu with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 03 Jan 2010 16:24:38 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 38 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cv-nat-a-61.cv.nrao.edu User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) Cancel-Lock: sha1:a+vPofvEkbiNFRvggfoGECe/iVk= 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:119311 Archived-At: Jan Djärv writes: > 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 kind of expected merge to merge changes without me having to check > in into the quickfix branch first. Is there such a command? > If I understand correctly, you want to first make edits to the files that make up your fix, then merge, and then make one commit which records all of this. You should be able to do that by passing the --force option to merge (from man bzr): bzr merge [LOCATION] Options: --force Merge even if the destination tree has uncommitted changes. I think it is usually better do the merge first (and resolve any possible conflicts) before making the edits that make up your fix. If you follow this procedure then there should be no need to --force. Best, Bojan -- Bojan Nikolic || http://www.bnikolic.co.uk