From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.bugs Subject: bug#12315: 24.1.50; apparent bug in bzr commit Date: Thu, 30 Aug 2012 19:26:37 -0400 Message-ID: Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: ger.gmane.org 1346369219 2852 80.91.229.3 (30 Aug 2012 23:26:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 30 Aug 2012 23:26:59 +0000 (UTC) To: 12315@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 31 01:27:00 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T7E8X-0007wn-R9 for geb-bug-gnu-emacs@m.gmane.org; Fri, 31 Aug 2012 01:26:58 +0200 Original-Received: from localhost ([::1]:45512 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7E8V-0007bA-Gu for geb-bug-gnu-emacs@m.gmane.org; Thu, 30 Aug 2012 19:26:55 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7E8R-0007Zg-Ck for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:26:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7E8Q-0003DM-19 for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:26:51 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7E8P-0003DI-TY for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:26:49 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1T7E9Z-0006gB-Rq for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:28:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Richard Stallman Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 30 Aug 2012 23:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 12315 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.134636927725661 (code B ref -1); Thu, 30 Aug 2012 23:28:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 30 Aug 2012 23:27:57 +0000 Original-Received: from localhost ([127.0.0.1]:58616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7E9U-0006fo-G6 for submit@debbugs.gnu.org; Thu, 30 Aug 2012 19:27:57 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42558) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7E9S-0006fg-GL for submit@debbugs.gnu.org; Thu, 30 Aug 2012 19:27:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7E8G-0003CE-Sp for submit@debbugs.gnu.org; Thu, 30 Aug 2012 19:26:42 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:55059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7E8G-0003CA-PK for submit@debbugs.gnu.org; Thu, 30 Aug 2012 19:26:40 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7E8F-0007ZJ-EH for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:26:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7E8D-0003BZ-Qp for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:26:39 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:35187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7E8D-0003BV-Mo for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 19:26:37 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T7E8D-0001D4-8H; Thu, 30 Aug 2012 19:26:37 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:63618 Archived-At: I used vc-directory then C-x v v to check in a change in lisp/simple.el and lisp/ChangeLog. lisp/mail/qp.el had an unrelated change, and I had not marked that file in the *vc-dir* buffer. However, it had a conflict. C-x v v gave me an error message about that conflict. I think that is a bug; it should have ignored the conflict since that file was not being operated on. In GNU Emacs 24.1.50.1 (mips64el-unknown-linux-gnu, GTK+ Version 2.12.12) of 2012-07-31 on chiefs-gnewsense Bzr revision: 109352 rgm@gnu.org-20120801021420-vmw6vrsr9w2xgkxf Configured using: `configure 'CFLAGS=-g -O0' '--with-gif=no' '--with-tiff=no'' Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: VC dir Minor modes in effect: diff-auto-refine-mode: t vc-parent-buffer: *vc-dir*<2> shell-dirtrack-mode: t gpm-mouse-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 auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: . RET C-c C-c C-d x ESC x l y n x RET C-s N e x t ESC < ESC x C-u C-n C-u C-n C-u C-n C-u C-n C-n C-n C-n ESC x w g e t RET C-p C-p C-p C-e 2 / C-c C-s DEL DEL 3 / C-c C-s DEL DEL 4 / C-c C-s C-g C-x b * v c - TAB RET C-u C-n C-n C-n C-n C-n m C-p C-p C-p C-p C-n m C-x b s i m p l TAB RET ESC x b y t e SPC c o RET RET C-x b RET C-h m C-x o C-v C-x o C-x v v D e l e t e SPC ` z ' SPC i n SPC s p e c i a l - m o d e ESC [ 5 ~ m a p . C-u C-b - C-e C-n C-c C-c C-z C-x 0 C-x v v C-c C-c C-x 0 C-n C-n C-n C-n f y e s RET C-u C-v C-u C-v C-u C-v C-x v u y e s RET C-x b RET C-x v v C-c C-c C-p C-p C-p C-p C-p u C-n u ESC x r e n SPC f i DEL DEL u n RET C-x b N E W S RET C-x v v D e l e t e SPC z SPC b i n d i n g SPC i n SPC s p e c i a l - m o d e - m a p . C-n C-c C-c C-x k RET ESC x r e p o r t SPC e m a v s SPC b u g DEL DEL DEL DEL DEL c s SPC b u g RET Recent messages: Finding changes in /home/rms/emacs-bzr/trunk/lisp/gnus/qp.el... Reverting /home/rms/emacs-bzr/trunk/lisp/gnus/qp.el...done Mark set Press C-c C-c when you are done editing. Enter a change comment. Type C-c C-c when done Checking in /home/rms/emacs-bzr/trunk/lisp/ChangeLog /home/rms/emacs-bzr/trunk/lisp/simple.el...done Mark set Press C-c C-c when you are done editing. Enter a change comment. Type C-c C-c when done Checking in /home/rms/emacs-bzr/trunk/etc/NEWS...done Load-path shadows: None found. Features: (smerge-mode diff-mode log-edit pcvs-util gv vc-sccs vc-svn vc-rcs vc-dir ewoc vc ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff vc-dispatcher noutline outline easy-mmode bug-reference add-log mail-extr ispell byte-opt bytecomp byte-compile cconv macroexp rmailsum compare-w novice doc-view image-mode arc-mode archive-mode jka-compr bookmark pp shadow emacsbug edmacro kmacro vc-bzr find-func help-fns apropos ind-util tabify man parse-time vc-cvs sgml-mode etags dired-aux cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew holidays hol-loaddefs cal-move cal-menu calendar cal-loaddefs epa-mail epa derived epg epg-config rmailout rlogin dabbrev misearch multi-isearch quail help-mode qp mule-util shell pcomplete grep compile comint ansi-color ring mailalias rmailmm message sendmail format-spec rfc822 mml easymenu mml-sec mm-decode mm-bodies mm-encode mailabbrev gmm-utils mailheader mail-parse rfc2231 dired t-mouse time-date rmailedit rmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils paren cus-start cus-load tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar 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 minibuffer loaddefs button faces cus-face files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! That's nonfree (freedom-denying) software. Use Ekiga or an ordinary phone call