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: Bzr document unclear. There is no "conflict markers". Date: Sun, 03 Jan 2010 13:44:59 +0100 Message-ID: <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 1262522723 23442 80.91.229.12 (3 Jan 2010 12:45:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 12:45:23 +0000 (UTC) To: Emacs-Devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 03 13:45:16 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 1NRPpb-0000hf-Sy for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 13:45:16 +0100 Original-Received: from localhost ([127.0.0.1]:44627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRPpc-0003ox-9X for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 07:45:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRPpX-0003nG-0G for emacs-devel@gnu.org; Sun, 03 Jan 2010 07:45:11 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRPpR-0003dz-I7 for emacs-devel@gnu.org; Sun, 03 Jan 2010 07:45:10 -0500 Original-Received: from [199.232.76.173] (port=53234 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRPpR-0003dr-DO for emacs-devel@gnu.org; Sun, 03 Jan 2010 07:45:05 -0500 Original-Received: from proxy2.bredband.net ([195.54.101.72]:63389) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRPpR-0003SR-47 for emacs-devel@gnu.org; Sun, 03 Jan 2010 07:45:05 -0500 Original-Received: from ipb2.telenor.se (195.54.127.165) by proxy2.bredband.net (7.3.140.3) id 4AD3E1BC021EECA0 for emacs-devel@gnu.org; Sun, 3 Jan 2010 13:45:00 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ajc0AKMfQEtV4S1uPGdsb2JhbACBRIIbl1wBAQEBN6h2jBSBLYIuVgQ X-IronPort-AV: E=Sophos;i="4.47,492,1257116400"; d="scan'208";a="22703105" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 03 Jan 2010 13:45:00 +0100 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id C53897FA07B for ; Sun, 3 Jan 2010 13:44:59 +0100 (CET) User-Agent: Thunderbird 2.0.0.23 (X11/20090817) 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:119304 Archived-At: Hi. I tried to follow the worklflow for a quick change: "Workflow for a Quick Change First, refresh your mirror and then the working branch: cd $DEVHOME/emacs/trunk bzr update # update from the upstream master (= optional) cd ../quickfixes bzr merge # update from /trunk/ (optional) The reason you use =E2=80=9Cmerge=E2=80=9D instead of =E2=80=9Cupdate=E2=80= =9D in the task branch is that your=20 task branch has local changes =E2=80=93 it has diverged (a bit) from the = upstream=20 master, and so any changes from upstream have to be merged with your chan= ges. The merge may fail due to a change that conflicts with your branch. You=E2= =80=99ll=20 need to fix the problem (looking for conflict markers and editing, just a= s in=20 CVS), then ..." When I do the merge it just says: % bzr merge bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommitted= =20 changes (See bzr status). If I do bzr status, almost the whole tree is listed as modified (except f= iles=20 added and removed and not version controlled). I certainly didn't modify all files, in fact I modified none. I just tri= ed to=20 sync from savannah before starting to modify files. Is this expected fro= m=20 bzr? Should I create a new branch each time I sync from savannah, as reu= sing=20 branches for fixes doesn't work? Jan D.