From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Error in BZR Wiki document?
Date: Tue, 05 Jan 2010 10:45:55 -0500 [thread overview]
Message-ID: <jwvskakmu98.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87aawsh9yu.fsf@telefonica.net> ("Óscar Fuentes"'s message of "Tue, 05 Jan 2010 16:01:29 +0100")
> I think that when you open a conflicted file on Emacs, it activates
> SMerge and after you remove the conflict text markers and save the
> file, SMerge automatically does a `bzr resolve'.
Indeed, except it's VC which does it, not SMerge.
>> What is bzr resolve supposed to do anyway?
> It prevents you from committing a conflicted file.
Or rather Bzr prevents you from committing a conflicted file, so you
have to tell it when you're resolved a conflict.
Stefan
next prev parent reply other threads:[~2010-01-05 15:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-05 14:40 Error in BZR Wiki document? Jan Djärv
2010-01-05 15:01 ` Óscar Fuentes
2010-01-05 15:45 ` Stefan Monnier [this message]
2010-01-06 3:32 ` Karl Fogel
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=jwvskakmu98.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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).