From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dieter Wilhelm Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#4280: 23.1.50; vc-update fails under conflicts Date: Fri, 28 Aug 2009 07:45:08 +0200 Message-ID: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> Reply-To: Dieter Wilhelm , 4280@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1251439638 17475 80.91.229.12 (28 Aug 2009 06:07:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Aug 2009 06:07:18 +0000 (UTC) Cc: rfrancoise@debian.org To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 28 08:07:10 2009 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 1Mguc8-00029B-IU for geb-bug-gnu-emacs@m.gmane.org; Fri, 28 Aug 2009 08:07:08 +0200 Original-Received: from localhost ([127.0.0.1]:36960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mguc7-0005Tb-Nq for geb-bug-gnu-emacs@m.gmane.org; Fri, 28 Aug 2009 02:07:07 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mguc1-0005SX-M3 for bug-gnu-emacs@gnu.org; Fri, 28 Aug 2009 02:07:01 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mgubw-0005SL-Ic for bug-gnu-emacs@gnu.org; Fri, 28 Aug 2009 02:07:01 -0400 Original-Received: from [199.232.76.173] (port=56746 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgubw-0005SI-AB for bug-gnu-emacs@gnu.org; Fri, 28 Aug 2009 02:06:56 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:43600) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mgubv-0003K5-NH for bug-gnu-emacs@gnu.org; Fri, 28 Aug 2009 02:06:56 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7S66rsY012512; Thu, 27 Aug 2009 23:06:53 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n7S5o4mw008709; Thu, 27 Aug 2009 22:50:04 -0700 Resent-Date: Thu, 27 Aug 2009 22:50:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Dieter Wilhelm Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Fri, 28 Aug 2009 05:50:04 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12514383338066 (code B ref -1); Fri, 28 Aug 2009 05:50:04 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 28 Aug 2009 05:45:33 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7S5jVCK008059 for ; Thu, 27 Aug 2009 22:45:32 -0700 Original-Received: from mx10.gnu.org ([199.232.76.166]:57846) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1MguHC-0000yV-Po for emacs-pretest-bug@gnu.org; Fri, 28 Aug 2009 01:45:30 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1MguH9-0000Fh-Rc for emacs-pretest-bug@gnu.org; Fri, 28 Aug 2009 01:45:30 -0400 Original-Received: from moutng.kundenserver.de ([212.227.17.10]:55582) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MguH9-0000Em-7y for emacs-pretest-bug@gnu.org; Fri, 28 Aug 2009 01:45:27 -0400 Original-Received: from urmel.duenenhof-wilhelm.de (p54A70984.dip0.t-ipconnect.de [84.167.9.132]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MKsym-1MguGw3ND2-000mLK; Fri, 28 Aug 2009 07:45:15 +0200 Original-Received: from dieter by urmel.duenenhof-wilhelm.de with local (Exim 4.69) (envelope-from ) id 1MguGv-0001Uu-U7; Fri, 28 Aug 2009 07:45:13 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-Provags-ID: V01U2FsdGVkX1/g1SHFuSuUD9YyD1GiIIF4B006iskwH/78sQS AjpakIWzIRbXLby8f0WVK003zc8QKH4Xpkfwvxe6PJejDUanoW kqHWzQaD7GrDIlsuezJaA== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 28 Aug 2009 02:07:01 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list 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:30623 gmane.emacs.pretest.bugs:24988 Archived-At: Hi When using vc-update I'm receiving the following error message in *vc*: Conflict discovered in 'ansys-mode.el'. Select: (p) postpone, (df) diff-full, (e) edit, (h) help for more options: svn: Can't read stdin: End of file found In GNU Emacs 23.1.50.1 (i486-pc-linux-gnu, GTK+ Version 2.12.12) of 2009-07-30 on elegiac, modified by Debian (emacs-snapshot package, version 1:20090730-1~lenny1) Windowing system distributor `The X.Org Foundation', version 11.0.10402000 configured using `configure '--build' 'i486-linux-gnu' '--host' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs-snapshot:/etc/emacs:/usr/local/share/emacs/23.1.50/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.1.50/site-lisp:/usr/share/emacs/site-lisp' '--with-x=yes' '--with-x-toolkit=gtk' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g -O2' 'LDFLAGS=-g -Wl,--as-needed' 'CPPFLAGS='' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: Fundamental Minor modes in effect: shell-dirtrack-mode: t global-hl-line-mode: t display-time-mode: t show-paren-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: C-x C-f C-g C-x o C-s a n s C-n C-n C-n C-n y C-x v m C-SPC C-n C-n C-n M-w M-x M-p M-n C-a C-k r e p o r t Recent messages: Marking diary entries...done For information about GNU Emacs and the GNU system, type C-h C-a. Loading tramp...done Quit Mark saved where search started Please type y, n, or !: Merging changes into /home/dieter/ansys-mode_11.0.2/ansys-mode.el... vc-do-command: Running svn update ansys-mode.el...FAILED (status 1) Mark set goto-history-element: Beginning of history; no preceding item Load-path shadows: /usr/share/emacs/site-lisp/maxima/emaxima hides /usr/share/emacs-snapshot/site-lisp/maxima/emaxima /usr/share/emacs/site-lisp/maxima/smart-complete hides /usr/share/emacs-snapshot/site-lisp/maxima/smart-complete /usr/share/emacs/site-lisp/maxima/maxima hides /usr/share/emacs-snapshot/site-lisp/maxima/maxima /usr/share/emacs/site-lisp/maxima/bookmode hides /usr/share/emacs-snapshot/site-lisp/maxima/bookmode /usr/share/emacs/site-lisp/maxima/maxima-font-lock hides /usr/share/emacs-snapshot/site-lisp/maxima/maxima-font-lock /usr/share/emacs/site-lisp/maxima/sshell hides /usr/share/emacs-snapshot/site-lisp/maxima/sshell /usr/share/emacs/23.1.50/site-lisp/debian-startup hides /usr/share/emacs/site-lisp/debian-startup