From: Glenn Morris <rgm@gnu.org>
To: rms@gnu.org
Cc: 12315@debbugs.gnu.org
Subject: bug#12315: 24.1.50; apparent bug in bzr commit
Date: Thu, 30 Aug 2012 21:17:51 -0400 [thread overview]
Message-ID: <3sbohrzwow.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <E1T7E8D-0001D4-8H@fencepost.gnu.org> (Richard Stallman's message of "Thu, 30 Aug 2012 19:26:37 -0400")
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.
next prev parent reply other threads:[~2012-08-31 1:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-30 23:26 bug#12315: 24.1.50; apparent bug in bzr commit Richard Stallman
2012-08-31 1:17 ` Glenn Morris [this message]
2012-08-31 16:48 ` Richard Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3sbohrzwow.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=12315@debbugs.gnu.org \
--cc=rms@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).