From unknown Mon Jun 23 18:27:37 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#7152 <7152@debbugs.gnu.org> To: bug#7152 <7152@debbugs.gnu.org> Subject: Status: vc-update fails under conflicts (bug#4280) Reply-To: bug#7152 <7152@debbugs.gnu.org> Date: Tue, 24 Jun 2025 01:27:37 +0000 retitle 7152 vc-update fails under conflicts (bug#4280) reassign 7152 emacs submitter 7152 Olof Ohlsson Sax severity 7152 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 03 10:24:28 2010 Received: (at submit) by debbugs.gnu.org; 3 Oct 2010 14:24:28 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2PUI-0007t9-VK for submit@debbugs.gnu.org; Sun, 03 Oct 2010 10:24:27 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2PAm-0007ls-8Q for submit@debbugs.gnu.org; Sun, 03 Oct 2010 10:04:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P2PDh-0000kp-Gk for submit@debbugs.gnu.org; Sun, 03 Oct 2010 10:07:19 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([199.232.76.165]:52084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P2PDh-0000kh-6Y for submit@debbugs.gnu.org; Sun, 03 Oct 2010 10:07:17 -0400 Received: from [140.186.70.92] (port=55238 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2PDf-0008I4-SY for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 10:07:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P2PDd-0000kN-UF for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 10:07:15 -0400 Received: from mail-ey0-f169.google.com ([209.85.215.169]:44719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P2PDd-0000kG-LT for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 10:07:13 -0400 Received: by eyh5 with SMTP id 5so2030425eyh.0 for ; Sun, 03 Oct 2010 07:07:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:content-type :content-transfer-encoding:subject:date:message-id:to:mime-version :x-mailer; bh=vpJv/fm62E/xYtei/apuX9N0N3Y2+KjHaoNDvCLpYFM=; b=iPirByZCJrF68IawxNcAyZZG8sCYkbXQrT4sUfFU23WGiC+nKOKaxYNcu1FhheDhMp q+jIssGfmC/9tYAO7rkPjyQ9CDC0lekbnCWS3+vQg1FEMDrQVa5dUWHv4DjlvB36/pwP X6ZwcB3fBE2MWWkSBdB92YMcCa259WBb6iWSo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:content-type:content-transfer-encoding:subject:date:message-id :to:mime-version:x-mailer; b=Ws8cbpXmgLXtobkK2UvJhGz5vsi2Ytvn6W0YUK5/+lbEpXb6XQFeHfUk98Xl3Pxex7 9tf4zLpOB8LR5UctjvV7qsJmcmM5ieWIdOyU3QDwJTaeLOi8swQ2ru6RT+ZHfAVuO+WQ nFsqbCVgayD4/JrhQ+D57jXlofDl7WZ78/lEg= Received: by 10.213.14.19 with SMTP id e19mr6088805eba.14.1286114832279; Sun, 03 Oct 2010 07:07:12 -0700 (PDT) Received: from [192.168.0.177] (c83-253-14-108.bredband.comhem.se [83.253.14.108]) by mx.google.com with ESMTPS id u9sm5428888eeh.17.2010.10.03.07.07.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 03 Oct 2010 07:07:10 -0700 (PDT) From: Olof Ohlsson Sax Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: vc-update fails under conflicts (bug#4280) Date: Sun, 3 Oct 2010 16:07:00 +0200 Message-Id: <5042D337-34A5-4643-8833-29D5C7F82F0D@gmail.com> To: bug-gnu-emacs@gnu.org Mime-Version: 1.0 (Apple Message framework v1081) X-Mailer: Apple Mail (2.1081) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -5.9 (-----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 03 Oct 2010 10:24:26 -0400 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 (-----) Hi When using vc-update I'm receiving the following error message in *vc*: Conflict discovered in 'refs.bib'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: svn: Can't read stdin: End of file found This bug was reported as bug#4280 in August 2009 and in January 2010 a = patch was applied to vc-svn.el to add the "--non-interactive" flag when = running "svn update" in vc-svn-update. However, when I run vc-update, = the function vc-svn-merge-news is called instead of vc-svn-update and = that function calls "svn update" without the "--non-interactive" flag. = The below patch adds this flag. (I'm using Aquamacs 2.1, but vc-svn.el is identical to the one in Emacs = trunk). Olof Ohlsson Sax =3D=3D=3D modified file 'lisp/vc/vc-svn.el' --- lisp/vc/vc-svn.el 2010-08-29 16:17:13 +0000 +++ lisp/vc/vc-svn.el 2010-10-03 13:58:13 +0000 @@ -374,7 +374,9 @@ (message "Merging changes into %s..." file) ;; (vc-file-setprop file 'vc-working-revision nil) (vc-file-setprop file 'vc-checkout-time 0) - (vc-svn-command nil 0 file "update") + (vc-svn-command nil 0 file=20 + "--non-interactive" ; bug#4280 + "update") ;; Analyze the merge result reported by SVN, and set ;; file properties accordingly. (with-current-buffer (get-buffer "*vc*") In GNU Emacs 23.2.50.1 (i386-apple-darwin9.8.0, NS apple-appkit-949.54) of 2010-08-18 on braeburn.aquamacs.org - Aquamacs Distribution 2.1 Windowing system distributor `Apple', version 10.3.1038 configured using `configure '--with-ns' '--without-x' 'CC=3Dgcc' = 'CFLAGS=3D-O3 -fno-tree-pre -falign-loops -arch i386' 'LDFLAGS=3D-O3 = -fno-tree-pre -falign-loops -arch i386'' 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: sv_SE.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: BibTeX Minor modes in effect: diff-auto-refine-mode: t TeX-PDF-mode: t TeX-source-correlate-mode: t savehist-mode: t smart-frame-positioning-mode: t aquamacs-autoface-mode: t recentf-mode: t osx-key-mode: t tabbar-mwheel-mode: t tabbar-mode: t show-paren-mode: t delete-selection-mode: t pc-selection-mode: t cua-mode: t tooltip-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t Recent input: ^X ^F =E2=87=A7N =E2=87=A7C H =20 4 S U P - A T =20 ^X V + ^X ^F =20 =E2=87=A7R E F R E F B ^S =E2=87=A7R Y A=20 N ^S ^E C C=20 A S D V C A D V E F D ^X ^S ^X V =3D ^X 1 =20 ^X B ^X V =3D ^X V + ^X K =20 ^X 1 =20 =20 ^X V =3D=20 ^X 1 ^X K ^X V + =20 ^H K ^X V + ^H=20 K ^X V M ^X V M =20 Recent messages: Finding changes in = /Users/olof/Documents/Notes/References/refs.bib...done (No files need saving) Merging changes into /Users/olof/Documents/Notes/References/refs.bib... ad-Orig-error: Running svn update refs.bib...FAILED (status 1) Finding changes in = /Users/olof/Documents/Notes/References/refs.bib...done (No files need saving) Merging changes into /Users/olof/Documents/Notes/References/refs.bib... ad-Orig-error: Running svn update refs.bib...FAILED (status 1) Type "q" to quit. [2 times] Merging changes into /Users/olof/Documents/Notes/References/refs.bib... ad-Orig-error: Running svn update refs.bib...FAILED (status 1) Load-path shadows: None found. Features: (shadow sort mail-extr message ecomplete rfc822 mml mml-sec password-cache mm-decode mm-bodies mm-encode mailabbrev nnheader gnus-util netrc gmm-utils mailheader canlock sha1 hex-util hashcash emacsbug diff-mode multi-isearch bibtex vc vc-dispatcher vc-svn preview prv-emacs reftex-vcr reftex-dcr reftex-auc reftex reftex-vars bib-cite tex-fold tex-bar tex-buf toolbar-x noutline outline font-latex latex edmacro kmacro tex-style tex latexenc url-http tls url-auth mail-parse rfc2231 rfc2047 rfc2045 qp ietf-drums url-gw url-cache url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse url-vars mm-util mail-prsvr mailcap mail-utils aquamacs-mode-defaults auctex-config server preview-latex tex-site auto-loads smart-dnd aquamacs-aux savehist mouse-sel one-buffer-one-frame smart-frame-positioning drews_init color-theme-autoloads saveplace visual-line aquamacs-bug aquamacs-autoface-mode aquamacs-editing sendmail recentf tree-widget cus-edit osxkeys emulate-mac-keyboard-mode frame-cmds strings misc-fns thingatpt+ thingatpt frame-fns avoid aquamacs-mac-fontsets fit-frame aquamacs-frame-setup aquamacs-tabbar tabbar-window cl cl-19 tabbar easy-mmode warnings cus-start cus-load aquamacs-site-start filladapt aquamacs-redo check-for-updates aquamacs-menu osx_defaults aquamacs-tool-bar aquamacs mac-extra-functions aquamacs-tools aquamacs-macros parse-time timezone time-date paren delsel pc-select cua-base wid-edit regexp-opt advice advice-preload byte-opt bytecomp byte-compile debug help-fns help-mode view image-file disp-table tooltip ediff-hook vc-hooks lisp-float-type mwheel ns-win easymenu tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button minibuffer faces cus-face files text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process ns multi-tty emacs) Command line: (/Applications/Aquamacs 2.1.app/Contents/MacOS/Aquamacs) PATH: = /Users/olof/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/texbin:/= usr/X11/bin:/Users/olof/bin:/opt/local/bin:/opt/local/sbin:/usr/local/texl= ive/2010/bin:/usr/local/texlive/2009/bin:/opt/local/bin:/opt/local/sbin:/U= sers/olof/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/texbin:/us= r/X11/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/us= r/texbin:/usr/local/texlive/2010/bin:/usr/local/texlive/2009/bin:/usr/texb= in:/usr/local/texlive/2010/bin:/usr/local/texlive/2009/bin exec-path: (/Users/olof/bin /usr/bin /bin /usr/sbin /sbin /usr/local/bin = /usr/texbin /usr/X11/bin /Users/olof/bin /opt/local/bin /opt/local/sbin = /usr/local/texlive/2010/bin /usr/local/texlive/2009/bin /opt/local/bin = /opt/local/sbin /Users/olof/bin /usr/bin /bin /usr/sbin /sbin = /usr/local/bin /usr/texbin /usr/X11/bin /opt/local/bin /opt/local/sbin = /usr/bin /bin /usr/sbin /sbin /usr/texbin /usr/local/texlive/2010/bin = /usr/local/texlive/2009/bin /Applications/Aquamacs = 2.1.app/Contents/MacOS/bin)= From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 03 15:42:50 2010 Received: (at 7152-done) by debbugs.gnu.org; 3 Oct 2010 19:42:50 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2USQ-0001OL-3s for submit@debbugs.gnu.org; Sun, 03 Oct 2010 15:42:50 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2USO-0001OG-Rh for 7152-done@debbugs.gnu.org; Sun, 03 Oct 2010 15:42:49 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1P2UVN-00055z-3N; Sun, 03 Oct 2010 15:45:53 -0400 To: 7152-done@debbugs.gnu.org Subject: Re: bug#7152: vc-update fails under conflicts (bug#4280) References: <5042D337-34A5-4643-8833-29D5C7F82F0D@gmail.com> From: Glenn Morris X-Spook: BRLO Albanian Ermes 9/11 INSCOM Juiliett Class Submarine X-Ran: V2PZ,JB-\JphMCV0DA5Klr^32`u8z (Olof Ohlsson Sax's message of "Sun\, 3 Oct 2010 16\:07\:00 +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.2 (------) X-Debbugs-Envelope-To: 7152-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: -6.2 (------) Thanks; applied. From unknown Mon Jun 23 18:27:37 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 01 Nov 2010 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator