From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 19:27:57 2012 Received: (at submit) by debbugs.gnu.org; 30 Aug 2012 23:27:57 +0000 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 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 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 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 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 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 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 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 Date: Thu, 30 Aug 2012 19:26:37 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: bug-gnu-emacs@gnu.org Subject: 24.1.50; apparent bug in bzr commit 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-Received-From: 208.118.235.17 X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org 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: -7.1 (-------) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 30 21:19:07 2012 Received: (at 12315) by debbugs.gnu.org; 31 Aug 2012 01:19:07 +0000 Received: from localhost ([127.0.0.1]:58673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7Ft5-0000xH-CZ for submit@debbugs.gnu.org; Thu, 30 Aug 2012 21:19:07 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:57445) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7Ft3-0000xA-He for 12315@debbugs.gnu.org; Thu, 30 Aug 2012 21:19:06 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T7Frr-0003ae-BD; Thu, 30 Aug 2012 21:17:51 -0400 From: Glenn Morris To: rms@gnu.org Subject: Re: bug#12315: 24.1.50; apparent bug in bzr commit References: X-Spook: COSCO supercomputer Aldergrove IMF Firewalls broadside X-Ran: 6[lVNx*cy'Y^t32to!|Cu^Da>"0+x<9S`e*+F~,(JAi_hn,,tKy~@*_t;dbg?Nw8Kl:dj' X-Hue: cyan X-Debbugs-No-Ack: yes X-Attribution: GM Date: Thu, 30 Aug 2012 21:17:51 -0400 In-Reply-To: (Richard Stallman's message of "Thu, 30 Aug 2012 19:26:37 -0400") Message-ID: <3sbohrzwow.fsf@fencepost.gnu.org> 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: -7.1 (-------) X-Debbugs-Envelope-To: 12315 Cc: 12315@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 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: -7.1 (-------) Richard Stallman wrote: > 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. This is a bzr issue, not an Emacs one, as can be demonstrated: mkdir test1 cd test1 touch 1 2 bzr init bzr add bzr commit -m "commit1" cd ../ bzr branch test1 test2 echo change >| test1/2 bzr commit -m "commit2" test1 cd test2 echo other-change >| 2 bzr pull # -> conflict in file 2 echo change >| 1 bzr commit -m "Try to commit file 1 only" 1 Result: bzr: ERROR: Conflicts detected in working tree. Use "bzr conflicts" to list, "bzr resolve FILE" to resolve. From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 31 12:50:21 2012 Received: (at 12315) by debbugs.gnu.org; 31 Aug 2012 16:50:21 +0000 Received: from localhost ([127.0.0.1]:59734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7UQG-0005xX-QK for submit@debbugs.gnu.org; Fri, 31 Aug 2012 12:50:20 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:47148) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7UQD-0005xP-UN for 12315@debbugs.gnu.org; Fri, 31 Aug 2012 12:50:18 -0400 Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T7UOx-00023U-QJ; Fri, 31 Aug 2012 12:48:59 -0400 Date: Fri, 31 Aug 2012 12:48:59 -0400 Message-Id: Content-Type: text/plain; charset=ISO-8859-15 From: Richard Stallman To: Glenn Morris In-reply-to: <3sbohrzwow.fsf@fencepost.gnu.org> (message from Glenn Morris on Thu, 30 Aug 2012 21:17:51 -0400) Subject: Re: bug#12315: 24.1.50; apparent bug in bzr commit References: <3sbohrzwow.fsf@fencepost.gnu.org> X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: 12315 Cc: 12315@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: rms@gnu.org 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: -7.1 (-------) Thanks, I will report the bug for bzr. -- 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Aug 31 12:52:45 2012 Received: (at control) by debbugs.gnu.org; 31 Aug 2012 16:52:45 +0000 Received: from localhost ([127.0.0.1]:59738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7USb-00060s-9n for submit@debbugs.gnu.org; Fri, 31 Aug 2012 12:52:45 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:47275) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T7USZ-00060m-RK for control@debbugs.gnu.org; Fri, 31 Aug 2012 12:52:44 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1T7URL-0002Ui-6C for control@debbugs.gnu.org; Fri, 31 Aug 2012 12:51:27 -0400 Date: Fri, 31 Aug 2012 12:51:27 -0400 Message-Id: Subject: control message for bug 12315 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -7.1 (-------) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 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: -7.1 (-------) tag 12315 notabug close 12315 From unknown Sat Jun 14 19:09:30 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 29 Sep 2012 11:24:03 +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