From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.bugs Subject: bug#3214: vc-dir problem when committing removed file to bzr Date: Tue, 19 Jan 2010 23:16:08 -0800 (PST) Message-ID: <201001200716.o0K7G8aC013349@godzilla.ics.uci.edu> References: <20090504223845.381524862E@rgr.rgrjr.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263973540 31195 80.91.229.12 (20 Jan 2010 07:45:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 20 Jan 2010 07:45:40 +0000 (UTC) Cc: 3214@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 20 08:45:32 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NXVFO-0003C2-Th for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Jan 2010 08:45:03 +0100 Original-Received: from localhost ([127.0.0.1]:42198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXVBC-0000zC-E6 for geb-bug-gnu-emacs@m.gmane.org; Wed, 20 Jan 2010 02:40:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXVA8-0000fz-G3 for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2010 02:39:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXVA3-0000er-Ii for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2010 02:39:35 -0500 Original-Received: from [199.232.76.173] (port=52220 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXVA1-0000eh-N1 for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2010 02:39:30 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:56172) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXVA1-000638-0F for bug-gnu-emacs@gnu.org; Wed, 20 Jan 2010 02:39:29 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NXUoI-0002n9-8H; Wed, 20 Jan 2010 02:17:02 -0500 X-Loop: bug-gnu-emacs@gnu.org Resent-From: Dan Nicolaescu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 20 Jan 2010 07:17:02 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: followup 3214 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 3214-submit@debbugs.gnu.org id=B3214.126397177910720 (code B ref 3214); Wed, 20 Jan 2010 07:17:02 +0000 Original-Received: (at 3214) by debbugs.gnu.org; 20 Jan 2010 07:16:19 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NXUna-0002mr-Tm for submit@debbugs.gnu.org; Wed, 20 Jan 2010 02:16:19 -0500 Original-Received: from paul-mcgann-v0.ics.uci.edu ([128.195.1.147]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NXUnZ-0002mk-Ee for 3214@debbugs.gnu.org; Wed, 20 Jan 2010 02:16:18 -0500 Original-Received: from godzilla.ics.uci.edu (godzilla.ics.uci.edu [128.195.10.101]) by paul-mcgann-v0.ics.uci.edu (8.13.8/8.13.8) with ESMTP id o0K7G8AC012913 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 19 Jan 2010 23:16:08 -0800 Original-Received: (from dann@localhost) by godzilla.ics.uci.edu (8.13.8+Sun/8.13.6/Submit) id o0K7G8aC013349; Tue, 19 Jan 2010 23:16:08 -0800 (PST) In-Reply-To: (Glenn Morris's message of "Tue, 19 Jan 2010 22:58:54 -0500") Original-Lines: 48 X-ICS-MailScanner-Information: Please send mail to helpdesk@ics.uci.edu or more information X-ICS-MailScanner-ID: o0K7G8AC012913 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_BZ 0.08) X-ICS-MailScanner-From: dann@godzilla.ics.uci.edu X-Spam-Score: -2.6 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list X-Spam-Score: -2.6 (--) Resent-Date: Wed, 20 Jan 2010 02:17:02 -0500 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:34538 Archived-At: Glenn Morris writes: > Just had what seems to be a same problem as this (bug#3214) with the > trunk from 2010-01-10. > > In the emacs admin/ directory, I did (from the command-line): > > bzr remove revdiff > > Then I edited the ChangeLog file, then did M-x vc-dir on the admin > directory. > > In the resulting buffer, the ChangeLog was marked as modified, and > revdiff as removed. > > I marked both files, hit `v', entered a log message, and tried to > commit. The vc-dir process finished with an error: > > Running bzr status ChangeLog in foreground... > Running bzr status ChangeLog...OK = 0 > Running bzr status revdiff in foreground... > vc-do-command: Running bzr status revdiff...FAILED (status 3) > Matches vc-do-command: Running bzr status revdiff...FAILED (... [-1-] We get to vc-do-command like this: vc-bzr-state -> vc-bzr-status -> vc-bzr-command -> vc-do-command vc-bzr-command is passed a 0 for OKSTATUS. but bzr status revdiff returns 3, that is why the message above is printed. Changing that 0 to 3 helps, but then vc-bzr-state prints "bzr: ERROR: Path(s) do not exist: revdiff". Maybe we can make vc-bzr-status ignore that message. I'd like to get a second opinion before making the 2 changes above (0->3 and ignore the error message). > I'm left with a vc-dir buffer which looks like: > > * up-to-date ChangeLog > * removed revdiff > > However, the commit to the repository did complete OK. The calls above occur after the checkin has been completed.