From: "Jan Djärv" <jan.h.d@swipnet.se>
To: Emacs-Devel <emacs-devel@gnu.org>
Subject: Bzr document unclear. There is no "conflict markers".
Date: Sun, 03 Jan 2010 13:44:59 +0100 [thread overview]
Message-ID: <4B40914B.4070203@swipnet.se> (raw)
Hi.
I tried to follow the worklflow for a quick change:
"Workflow for a Quick Change
First, refresh your mirror and then the working branch:
cd $DEVHOME/emacs/trunk
bzr update # update from the upstream master (optional)
cd ../quickfixes
bzr merge # update from /trunk/ (optional)
The reason you use “merge” instead of “update” in the task branch is that your
task branch has local changes – it has diverged (a bit) from the upstream
master, and so any changes from upstream have to be merged with your changes.
The merge may fail due to a change that conflicts with your branch. You’ll
need to fix the problem (looking for conflict markers and editing, just as in
CVS), then ..."
When I do the merge it just says:
% bzr merge
bzr: ERROR: Working tree "/home/jhd/src/bzr/emacs/fixes/" has uncommitted
changes (See bzr status).
If I do bzr status, almost the whole tree is listed as modified (except files
added and removed and not version controlled).
I certainly didn't modify all files, in fact I modified none. I just tried to
sync from savannah before starting to modify files. Is this expected from
bzr? Should I create a new branch each time I sync from savannah, as reusing
branches for fixes doesn't work?
Jan D.
next reply other threads:[~2010-01-03 12:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-03 12:44 Jan Djärv [this message]
2010-01-03 13:39 ` Bzr document unclear. There is no "conflict markers" Eli Zaretskii
2010-01-03 14:33 ` Jan Djärv
2010-01-03 15:10 ` Eli Zaretskii
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B40914B.4070203@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=emacs-devel@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.