From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.devel,gmane.emacs.pretest.bugs Subject: vc-svn and "resolved" Date: Sat, 08 Sep 2007 13:28:15 -0600 Message-ID: Reply-To: Tom Tromey NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1189281139 20957 80.91.229.12 (8 Sep 2007 19:52:19 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 8 Sep 2007 19:52:19 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Sep 08 21:52:19 2007 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.50) id 1IU6Lp-0004hk-D9 for ged-emacs-devel@m.gmane.org; Sat, 08 Sep 2007 21:52:17 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IU6Ln-0001RP-6g for ged-emacs-devel@m.gmane.org; Sat, 08 Sep 2007 15:52:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IU6JT-0000Bq-Iw for emacs-devel@gnu.org; Sat, 08 Sep 2007 15:49:51 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IU6JS-0000Am-Bg for emacs-devel@gnu.org; Sat, 08 Sep 2007 15:49:50 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IU6JR-0000Aa-K8 for emacs-devel@gnu.org; Sat, 08 Sep 2007 15:49:49 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IU6JR-0007VO-5r for emacs-devel@gnu.org; Sat, 08 Sep 2007 15:49:49 -0400 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IU6J6-0003dt-3p for emacs-pretest-bug@gnu.org; Sat, 08 Sep 2007 15:49:28 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1IU6JL-0007Sm-9Q for emacs-pretest-bug@gnu.org; Sat, 08 Sep 2007 15:49:48 -0400 Original-Received: from mx1.redhat.com ([66.187.233.31]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IU6JK-0007SG-Qa for emacs-pretest-bug@gnu.org; Sat, 08 Sep 2007 15:49:43 -0400 Original-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.1/8.13.1) with ESMTP id l88JnfFt019140 for ; Sat, 8 Sep 2007 15:49:41 -0400 Original-Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [10.11.255.20]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l88JnfYh010810 for ; Sat, 8 Sep 2007 15:49:41 -0400 Original-Received: from opsy.redhat.com (ton.toronto.redhat.com [172.16.14.15]) by pobox.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l88JneKf014686; Sat, 8 Sep 2007 15:49:40 -0400 Original-Received: by opsy.redhat.com (Postfix, from userid 500) id 6278FC88219; Sat, 8 Sep 2007 13:28:15 -0600 (MDT) X-Attribution: Tom X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) X-Detected-Kernel: Linux 2.6, seldom 2.4 (older, 4) 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:78290 gmane.emacs.pretest.bugs:19788 Archived-At: Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your bug report will be posted to the emacs-pretest-bug@gnu.org mailing list. Please describe exactly what actions triggered the bug and the precise symptoms of the bug: After an "svn update", sometimes a file will have a conflict. With svn, unlike cvs, you must run "svn resolved" on a file after resolving conflicts. I think vc-svn should do this for me. Ideally this would happen automatically when I edit out the conflict markers and save the file. However, even having 'C-x v v' do this at the appropriate point would be an improvement. Current I have to switch to the shell and do this by hand. If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file /usr/share/emacs/22.0.990/etc/DEBUG for instructions. In GNU Emacs 22.0.990.1 (i386-koji-linux-gnu, GTK+ Version 2.10.11) of 2007-05-23 on xenbuilder3.fedora.phx.redhat.com Windowing system distributor `The X.Org Foundation', version 11.0.70101000 configured using `configure '--build=i386-koji-linux-gnu' '--host=i386-koji-linux-gnu' '--target=i386-redhat-linux-gnu' '--program-prefix=' '--prefix=/usr' '--exec-prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--sysconfdir=/etc' '--datadir=/usr/share' '--includedir=/usr/include' '--libdir=/usr/lib' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sharedstatedir=/usr/com' '--mandir=/usr/share/man' '--infodir=/usr/share/info' '--with-pop' '--with-sound' '--with-gtk' 'build_alias=i386-koji-linux-gnu' 'host_alias=i386-koji-linux-gnu' 'target_alias=i386-redhat-linux-gnu' 'CFLAGS=-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables'' 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 locale-coding-system: utf-8 default-enable-multibyte-characters: t Major mode: CVS Minor modes in effect: compilation-in-progress: (gid grep grep compilation compilation compilation gid gid gid gid gid gid gid gid compilation compilation gid gid compilation gid gid gid gid gid compilation compilation compilation gid compilation compilation gid compilation grep grep grep grep gid grep compilation gid gid compilation compilation compilation compilation compilation compilation gid gid grep gid compilation gid gid compilation gid gid compilation gid gid gid gid compilation gid gid compilation compilation) erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-netsplit-mode: t erc-spelling-mode: t erc-truncate-mode: t shell-dirtrack-mode: t erc-status-mode: t erc-services-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-readonly-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t unify-8859-on-encoding-mode: t utf-translate-cjk-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-s C-g C-z o M-v C-z o C-g C-z o C-r s t a t e C-r C-r C-r C-r C-r C-z o C-s s t a t e C-s C-s C-s C-s C-s C-s C-s C-v C-s C-s C-s C-s C-v C-s G C-s C-u C-n C-l C-a C-s c o n f C-s l i c t C-s C-s C-s C-a C-s r e s o l C-s C-a M-x l g r e p r e s o o l v e d C-u C-b C-z o C-x b p s M-x f i n d - f u n s v - n - u p e x C-s s v n - u p d a t e C-s C-s C-s C-s C-s g g g g C-g C-g C-g C-g C-s a u t o l o a d C-s C-s C-s C-s C-s C-s C-g C-g C-g C-g C-z o C-x o C-x 1 C-z o C-z o C-c b M-x r e p o r e m b C-g M-x c v s - u d C-z o C-u C-u C-n C-l C-s r e s o l v e d C-s C-s C-s C-s C-s C-r C-r C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s C-a C-r C-r C-r C-s C-s C-s C-s C-s C-a C-z o C-v C-v C-v C-v C-v C-v C-l C-s v c C-n C-n C-n C-l C-v C-v C-l C-x C-g M-x r e p o r t - e b Recent messages: Making completion list... Quit Loading pcvs...done (No files need saving) Running cvs update ... Mark saved where search started [2 times] Loading smerge-mode...done CVS process has completed in *cvs* Mark saved where search started Loading emacsbug...done Tom