bug#12315: 24.1.50; apparent bug in bzr commit

bug#12315: 24.1.50; apparent bug in bzr commit

[Richard Stallman]

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

bug#12315: 24.1.50; apparent bug in bzr commit

[Glenn Morris]

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.

bug#12315: 24.1.50; apparent bug in bzr commit

[Richard Stallman]

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