From: Alan Mackenzie <acm@muc.de>
To: emacs-devel@gnu.org
Subject: Help me unstick my bzr, please.
Date: Fri, 15 Jan 2010 22:27:24 +0000 [thread overview]
Message-ID: <20100115222724.GB1931@muc.de> (raw)
Hi, Emacs,
I've been struggling with this fine distributed version control system
for over a week now. My trouble is that I have no mental picture of
what the main bits are in bzr and what the relationships between them
are. I don't find the bazaar documentation much help in forming such a
mental picture.
Specific problem: I have just fixed a bug in my "quickfixes" branch.
This involved changing a single C file and .../src/ChangeLog. I
attempt to merge the change into my "trunk" branch by doing this:
~/emacs/emacs.bzr/quickfixes$ bzr merge
I get this error message:
bzr: ERROR: Working tree "/home/acm/emacs/emacs.bzr/quickfixes/" has
uncommitted changes (See bzr status).
When I execute bzr status, it gives me a list of ~55 allegedly modified
files, finishing up with:
pending merge tips: (use -v to see all merge revisions)
Jan D. 2010-01-06 [merge] Fix slowdown and wrong font choosed by XSETTINGS...
Would somebody please tell me what I might have done to make bzr think
I've got 55 modified files? How might I recover from this?
--
Alan Mackenzie (Nuremberg, Germany).
next reply other threads:[~2010-01-15 22:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 22:27 Alan Mackenzie [this message]
2010-01-16 2:37 ` Help me unstick my bzr, please Giorgos Keramidas
2010-01-16 7:48 ` Eli Zaretskii
2010-01-16 8:29 ` Stephen J. Turnbull
2010-01-16 8:41 ` Stephen J. Turnbull
2010-01-16 8:59 ` Eli Zaretskii
2010-01-17 6:04 ` Stephen J. Turnbull
2010-01-16 9:02 ` Giorgos Keramidas
2010-01-16 9:57 ` Eli Zaretskii
2010-01-16 10:04 ` Giorgos Keramidas
2010-01-16 9:16 ` Lennart Borgman
2010-01-16 9:53 ` Andreas Schwab
2010-01-16 9:54 ` Eli Zaretskii
2010-01-16 9:59 ` Giorgos Keramidas
2010-01-16 10:02 ` Lennart Borgman
2010-01-16 11:17 ` Eli Zaretskii
2010-01-17 6:23 ` Simple unsticking with 'bzr shelve' [was: Help me unstick ...] Stephen J. Turnbull
2010-01-16 19:36 ` Help me unstick my bzr, please Stefan Monnier
2010-01-16 21:38 ` Alan Mackenzie
2010-01-17 7:50 ` Giorgos Keramidas
2010-01-16 10:10 ` Eli Zaretskii
2010-01-16 21:27 ` Alan Mackenzie
2010-01-16 21:32 ` Juanma Barranquero
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=20100115222724.GB1931@muc.de \
--to=acm@muc.de \
--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 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).