From unknown Sun Aug 17 01:00:20 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#4280: 23.1.50; vc-update fails under conflicts Reply-To: Dieter Wilhelm , 4280@debbugs.gnu.org Resent-From: Dieter Wilhelm Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Fri, 28 Aug 2009 05:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: report 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by submit@emacsbugs.donarmstrong.com id=B.12514383338066 (code B ref -1); Fri, 28 Aug 2009 05:50:04 +0000 Received: (at submit) by emacsbugs.donarmstrong.com; 28 Aug 2009 05:45:33 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=FOURLA autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 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 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 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 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 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 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 From: Dieter Wilhelm To: emacs-pretest-bug@gnu.org Cc: rfrancoise@debian.org Date: Fri, 28 Aug 2009 07:45:08 +0200 Message-ID: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Provags-ID: V01U2FsdGVkX1/g1SHFuSuUD9YyD1GiIIF4B006iskwH/78sQS AjpakIWzIRbXLby8f0WVK003zc8QKH4Xpkfwvxe6PJejDUanoW kqHWzQaD7GrDIlsuezJaA== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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 From unknown Sun Aug 17 01:00:20 2025 X-Loop: owner@emacsbugs.donarmstrong.com Subject: bug#4280: 23.1.50; vc-update fails under conflicts Reply-To: Dieter Wilhelm , 4280@debbugs.gnu.org Resent-From: Dieter Wilhelm Resent-To: bug-submit-list@lists.donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Mon, 31 Aug 2009 22:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-Emacs-PR-Message: followup 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Received: via spool by 4280-submit@emacsbugs.donarmstrong.com id=B4280.125175735412791 (code B ref 4280); Mon, 31 Aug 2009 22:30:03 +0000 Received: (at 4280) by emacsbugs.donarmstrong.com; 31 Aug 2009 22:22:34 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=AWL,FOURLA,SPF_HELO_PASS autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n7VMMVJ6012649 for <4280@emacsbugs.donarmstrong.com>; Mon, 31 Aug 2009 15:22:33 -0700 Received: from urmel.duenenhof-wilhelm.de (p54A70989.dip0.t-ipconnect.de [84.167.9.137]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKv5w-1MiFGZ3kp9-0004UF; Tue, 01 Sep 2009 00:22:24 +0200 Received: from dieter by urmel.duenenhof-wilhelm.de with local (Exim 4.69) (envelope-from ) id 1MiFGb-0001jH-0y; Tue, 01 Sep 2009 00:22:25 +0200 To: 4280@debbugs.gnu.org From: Dieter Wilhelm Date: Tue, 01 Sep 2009 00:22:19 +0200 Message-ID: <87r5ury678.fsf@urmel.duenenhof-wilhelm.de> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Provags-ID: V01U2FsdGVkX1/IEEfmjlJQyP3Mlw+N7B2/DDdFhPGFJ39tc/K /wfPLx7kb0E5GvfVrhno4SkbXJ97awhB+ShKY0aEFjT5f/24+h TP89OuyvEL6jGwuc69DUw== Hi, strange, at work I built an Emacs 23.1.1 from source and with it vc-update/vc-merge for svn worked also under conflicts (vc evoked smerge)! Maybe this is an debian snapshot problem, I'm wondering how to check this? But then, there is also no mechanism in vc for svn (or emacs) resolving the "conflicts" or removing the "conflict files". I think it would be the most convenient and logical when vc-next-action could check whether there are "conflict files" and would do something in the line of "svn resolve FILE" before trying to check in. Best wishes Dieter From unknown Sun Aug 17 01:00:20 2025 X-Loop: bug-gnu-emacs@gnu.org Subject: bug#4280: vc-update fails under conflicts Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jan 2010 02:49:03 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: followup 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: To: 4280@debbugs.gnu.org Received: via spool by 4280-submit@debbugs.gnu.org id=B4280.126456054213586 (code B ref 4280); Wed, 27 Jan 2010 02:49:03 +0000 Received: (at 4280) by debbugs.gnu.org; 27 Jan 2010 02:49:02 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NZxxl-0003X2-N7 for submit@debbugs.gnu.org; Tue, 26 Jan 2010 21:49:01 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NZxxj-0003Wx-EG for 4280@debbugs.gnu.org; Tue, 26 Jan 2010 21:48:59 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NZxxf-00027P-PL; Tue, 26 Jan 2010 21:48:55 -0500 References: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> From: Glenn Morris X-Spook: Semtex Taiwan bullion bomb Rubin USCODE clones NORAD X-Ran: (Dieter Wilhelm's message of "Fri\, 28 Aug 2009 07\:45\:08 +0200") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.0 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.0 (------) Dieter Wilhelm wrote: > 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 It seems that in recent versions of svn, `svn update' defaults to offering this "interactive conflict resolution". It can be disabled by passing the --non-interactive option to svn. This option seems to have been first added to svn in 2002, so it's probably fine to use this unconditionally in vc-svn.el. From unknown Sun Aug 17 01:00:20 2025 X-Loop: bug-gnu-emacs@gnu.org Subject: bug#4280: vc-update fails under conflicts Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jan 2010 04:14:01 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: followup 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: To: Glenn Morris Cc: 4280@debbugs.gnu.org Received: via spool by 4280-submit@debbugs.gnu.org id=B4280.126456561318633 (code B ref 4280); Wed, 27 Jan 2010 04:14:01 +0000 Received: (at 4280) by debbugs.gnu.org; 27 Jan 2010 04:13:33 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NZzHY-0004qU-Gd for submit@debbugs.gnu.org; Tue, 26 Jan 2010 23:13:32 -0500 Received: from pantheon-po42.its.yale.edu ([130.132.50.101]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NZzHX-0004qP-7l for 4280@debbugs.gnu.org; Tue, 26 Jan 2010 23:13:31 -0500 Received: from furry (adsl-99-58-201-143.dsl.wlfrct.sbcglobal.net [99.58.201.143]) (authenticated bits=0) by pantheon-po42.its.yale.edu (8.12.11.20060308/8.12.11) with ESMTP id o0R4DRuj018134 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 26 Jan 2010 23:13:27 -0500 Received: by furry (Postfix, from userid 1000) id 741E6C05D; Tue, 26 Jan 2010 21:13:27 -0700 (MST) From: Chong Yidong References: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> Date: Tue, 26 Jan 2010 23:13:27 -0500 In-Reply-To: (Glenn Morris's message of "Tue, 26 Jan 2010 21:48:55 -0500") Message-ID: <87pr4wfamw.fsf@stupidchicken.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-YaleITSMailFilter: Version 1.2c (attachment(s) not renamed) X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.9 (---) Glenn Morris writes: > It seems that in recent versions of svn, `svn update' defaults to > offering this "interactive conflict resolution". It can be disabled by > passing the --non-interactive option to svn. This option seems to have > been first added to svn in 2002, so it's probably fine to use this > unconditionally in vc-svn.el. OK, could you please do that? (Thanks in advance.) From unknown Sun Aug 17 01:00:20 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) X-Loop: bug-gnu-emacs@gnu.org From: bug-gnu-emacs@gnu.org (Emacs bug Tracking System) To: Dieter Wilhelm Subject: bug#4280 closed by Glenn Morris (Re: bug#4280: vc-update fails under conflicts) Message-ID: References: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> X-Emacs-PR-Message: they-closed 4280 X-Emacs-PR-Package: emacs Reply-To: 4280@debbugs.gnu.org Date: Thu, 28 Jan 2010 05:56:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1264658161-3287-1" This is a multi-part message in MIME format... ------------=_1264658161-3287-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is an automatic notification regarding your bug report which was filed against the emacs package: #4280: 23.1.50; vc-update fails under conflicts It has been closed by Glenn Morris . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact Glenn Morris by replying to this email. --=20 4280: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D4280 Emacs Bug Tracking System Contact bug-gnu-emacs@gnu.org with problems ------------=_1264658161-3287-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 4280-done) by debbugs.gnu.org; 28 Jan 2010 05:55:16 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NaNLX-0000qd-8R for submit@debbugs.gnu.org; Thu, 28 Jan 2010 00:55:15 -0500 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NaNLV-0000qW-WA for 4280-done@debbugs.gnu.org; Thu, 28 Jan 2010 00:55:14 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NaNLS-0005pF-PF; Thu, 28 Jan 2010 00:55:10 -0500 To: 4280-done@debbugs.gnu.org Subject: Re: bug#4280: vc-update fails under conflicts References: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> <87pr4wfamw.fsf@stupidchicken.com> From: Glenn Morris X-Spook: NASA 9/11 Area 51 Europol Hamas SHA Consul import X-Ran: Od.PXv}=eu?IW#:xJpie-v;Hri,l\K<`#?r/b+:~q>|ayQQ|cABWV#6{k'EDuV)|pCn9\5 X-Hue: yellow X-Debbugs-No-Ack: yes X-Attribution: GM Date: Thu, 28 Jan 2010 00:55:10 -0500 In-Reply-To: <87pr4wfamw.fsf@stupidchicken.com> (Chong Yidong's message of "Tue\, 26 Jan 2010 23\:13\:27 -0500") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.9 (-----) X-Debbugs-Envelope-To: 4280-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -5.9 (-----) * vc-svn.el (vc-svn-update): Use "svn --non-interactive". ------------=_1264658161-3287-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by emacsbugs.donarmstrong.com; 28 Aug 2009 05:45:33 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=FOURLA autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 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 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 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 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 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 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 From: Dieter Wilhelm To: emacs-pretest-bug@gnu.org Cc: rfrancoise@debian.org Subject: 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Provags-ID: V01U2FsdGVkX1/g1SHFuSuUD9YyD1GiIIF4B006iskwH/78sQS AjpakIWzIRbXLby8f0WVK003zc8QKH4Xpkfwvxe6PJejDUanoW kqHWzQaD7GrDIlsuezJaA== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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 ------------=_1264658161-3287-1--