From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#12315: 24.1.50; apparent bug in bzr commit Date: Thu, 30 Aug 2012 21:17:51 -0400 Message-ID: <3sbohrzwow.fsf@fencepost.gnu.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1346375939 16930 80.91.229.3 (31 Aug 2012 01:18:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 31 Aug 2012 01:18:59 +0000 (UTC) Cc: 12315@debbugs.gnu.org To: rms@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 31 03:18:59 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 1T7Fst-000273-Ve for geb-bug-gnu-emacs@m.gmane.org; Fri, 31 Aug 2012 03:18:56 +0200 Original-Received: from localhost ([::1]:59524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7Fsr-0002eh-KD for geb-bug-gnu-emacs@m.gmane.org; Thu, 30 Aug 2012 21:18:53 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7Fsp-0002eY-3f for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 21:18:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T7Fso-00059B-8V for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 21:18:51 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T7Fso-000597-56 for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 21:18:50 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1T7Fty-0000yi-Go for bug-gnu-emacs@gnu.org; Thu, 30 Aug 2012 21:20:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 31 Aug 2012 01:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12315 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12315-submit@debbugs.gnu.org id=B12315.13463759473678 (code B ref 12315); Fri, 31 Aug 2012 01:20:02 +0000 Original-Received: (at 12315) by debbugs.gnu.org; 31 Aug 2012 01:19:07 +0000 Original-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 Original-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 Original-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 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-Attribution: GM In-Reply-To: (Richard Stallman's message of "Thu, 30 Aug 2012 19:26:37 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:63620 Archived-At: 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.