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 08:39:51 -0500 Message-ID: References: <4B40914B.4070203@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 1262526083 31353 80.91.229.12 (3 Jan 2010 13:41:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 13:41:23 +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 14:41: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 1NRQhn-000701-MK for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 14:41:15 +0100 Original-Received: from localhost ([127.0.0.1]:35415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRQho-0005ig-9G for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 08:41:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRQgj-00056V-PR for emacs-devel@gnu.org; Sun, 03 Jan 2010 08:40:09 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRQge-00054H-Dk for emacs-devel@gnu.org; Sun, 03 Jan 2010 08:40:09 -0500 Original-Received: from [199.232.76.173] (port=35452 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRQge-00054C-9Z for emacs-devel@gnu.org; Sun, 03 Jan 2010 08:40:04 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:47750) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRQge-0004yO-AL for emacs-devel@gnu.org; Sun, 03 Jan 2010 08:40:04 -0500 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NRQgR-0007Yu-IQ; Sun, 03 Jan 2010 08:39:51 -0500 In-reply-to: <4B40914B.4070203@swipnet.se> (message from =?UTF-8?B?SmFuIERqw6Rydg==?= on Sun, 03 Jan 2010 13:44:59 +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:119305 Archived-At: > Date: Sun, 03 Jan 2010 13:44:59 +0100 > From: Jan Djärv > > % bzr merge > bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommitted > changes (See bzr status). > > If I do bzr status, almost the whole tree is listed as modified (except files > added and removed and not version controlled). > > I certainly didn't modify all files, in fact I modified none. I just tried to > sync from savannah before starting to modify files. Is this expected from > bzr? 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. Perhaps you somehow did something wrong while creating the branch. If you start another branch, does "bzr status" show that all files are modified, right after branching? If not, when does it start showing modified files? > Should I create a new branch each time I sync from savannah Certainly not.