From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?Jan_Dj=E4rv?= Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Thu, 28 Jan 2010 14:02:59 +0100 Message-ID: <4B618B03.1060209@swipnet.se> References: <4B613BFB.2000107@swipnet.se> <4B61464E.7020008@swipnet.se> <4B618A4C.8050506@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: Quoted-Printable X-Trace: ger.gmane.org 1264684515 13741 80.91.229.12 (28 Jan 2010 13:15:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 13:15:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 14:15:12 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.69) (envelope-from ) id 1NaUDD-0001b2-1h for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 14:15:07 +0100 Original-Received: from localhost ([127.0.0.1]:60484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaU4B-0005I0-4m for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 08:05:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaU1k-0001m7-6t for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:03:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaU1f-0001bi-Aa for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:03:15 -0500 Original-Received: from [199.232.76.173] (port=40692 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaU1d-0001b4-Vc for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:03:10 -0500 Original-Received: from proxy1.bredband.net ([195.54.101.71]:36222) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaU1U-0003a4-IE; Thu, 28 Jan 2010 08:03:01 -0500 Original-Received: from ipb2.telenor.se (195.54.127.165) by proxy1.bredband.net (7.3.140.3) id 4AD3E1C002B972AA; Thu, 28 Jan 2010 14:02:59 +0100 X-SMTPAUTH-B2: X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AuVAAFsZYUtV4S1uPGdsb2JhbACBNIZUkzoBAQEBN74NhDwE X-IronPort-AV: E=Sophos;i="4.49,359,1262559600"; d="scan'208";a="30348232" Original-Received: from c-6e2de155.25-1-64736c10.cust.bredbandsbolaget.se (HELO coolsville.localdomain) ([85.225.45.110]) by ipb2.telenor.se with ESMTP; 28 Jan 2010 14:02:59 +0100 Original-Received: from [172.20.199.2] (gaffa [172.20.199.2]) by coolsville.localdomain (Postfix) with ESMTP id 471CC7FA01A; Thu, 28 Jan 2010 14:02:59 +0100 (CET) User-Agent: Thunderbird 2.0.0.23 (X11/20090817) In-Reply-To: <4B618A4C.8050506@swipnet.se> 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:120569 Archived-At: Jan Dj=E4rv skrev: > Eli Zaretskii skrev: >>> Date: Thu, 28 Jan 2010 09:09:50 +0100 >>> From: Jan_Dj=E4rv >>> CC: emacs-devel@gnu.org >>> >>> File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line=20 >>> 339, in commit >>> raise errors.CannotCommitSelectedFileMerge(self.specific_files) >>> CannotCommitSelectedFileMerge: Selected-file commit of merges is not=20 >>> supported yet: files src/xfns.c >> >> What do the following two commands show in the quickfixes branch >> (which is where you were working, right?)? >> >> bzr info >> bzr status >> The info below is probably not useful, I commited on the command line whe= n vc=20 failed, so the state where the error occurred is gone. Jan D. >=20 > % bzr info > Repository tree (format: 2a) > Location: > shared repository: /home/jhd/src/emacs > repository branch: . >=20 > Related branches: > parent branch: /home/jhd/src/emacs/trunk > % bzr status > unknown: > cmd > upd > src/.BAK.xterm.c > src/.gdb_history > src/tag-files > src/xx.el >=20 > Jan D. >=20 >=20 >=20