From: Eli Zaretskii <eliz@gnu.org>
To: "Jan Djärv" <jan.h.d@swipnet.se>
Cc: emacs-devel@gnu.org
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Sun, 03 Jan 2010 10:10:02 -0500 [thread overview]
Message-ID: <E1NRS5i-0001Oi-F8@fencepost.gnu.org> (raw)
In-Reply-To: <4B40AACE.9020002@swipnet.se> (message from Jan Djärv on Sun, 03 Jan 2010 15:33:50 +0100)
> Date: Sun, 03 Jan 2010 15:33:50 +0100
> From: Jan Djärv <jan.h.d@swipnet.se>
> CC: emacs-devel@gnu.org
>
> If I modify one file it just shows that as modified. I can't reproduce the
> original error. But it still doesn't show any conflict markers:
>
> % bzr merge
> bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommitted
> changes (See bzr status).
I see that as well when I have uncommitted changes on a branch, so
it's probably normal. Note that the wiki tells you to "bzr merge"
_before_ you start hacking. But you are right that this issue should
be more explicit; I will edit the wiki (unless someone more
knowledgeable points out where we both are mistaken).
> I kind of expected merge to merge changes without me having to check in into
> the quickfix branch first.
Why do you need that? It is so easy to uncommit on a local branch
that committing there shouldn't be a hard decision. It's not like you
are going to pollute a public repository.
> Is there such a command?
I don't know.
next prev parent reply other threads:[~2010-01-03 15:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-03 12:44 Bzr document unclear. There is no "conflict markers" Jan Djärv
2010-01-03 13:39 ` Eli Zaretskii
2010-01-03 14:33 ` Jan Djärv
2010-01-03 15:10 ` Eli Zaretskii [this message]
2010-01-03 19:17 ` Jan Djärv
2010-01-03 19:25 ` Eli Zaretskii
2010-01-04 0:14 ` Jan Djärv
2010-01-03 15:24 ` Bojan Nikolic
2010-01-03 21:59 ` Richard Stallman
2010-01-03 22:36 ` Bojan Nikolic
2010-01-04 16:23 ` Richard Stallman
2010-01-04 17:08 ` Stefan Monnier
2010-01-04 20:07 ` Bojan Nikolic
2010-01-04 4:08 ` Eli Zaretskii
2010-01-04 16:23 ` Richard Stallman
2010-01-04 18:27 ` Eli Zaretskii
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=E1NRS5i-0001Oi-F8@fencepost.gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jan.h.d@swipnet.se \
/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).