From: Lennart Borgman <lennart.borgman@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Giorgos Keramidas <keramida@ceid.upatras.gr>,
acm@muc.de, emacs-devel@gnu.org
Subject: Re: Help me unstick my bzr, please.
Date: Sat, 16 Jan 2010 10:16:37 +0100 [thread overview]
Message-ID: <e01d8a51001160116h75232865m97635a0f5f19cacf@mail.gmail.com> (raw)
In-Reply-To: <83k4vicwws.fsf@gnu.org>
On Sat, Jan 16, 2010 at 8:48 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>>
>> > 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?
>>
>> The "pending merge" message means that in the past (before you made the
>> quick fix to the two files) you did:
>>
>> bzr merge
>>
>> This pulled stuff from the local trunk branch, and merged it with your
>> local quickfixes branch. But you have to also run "bzr commit" to
>> complete the fix. You didn't at the time, so the quickfixes branch
>> remains in a "the merge has locally finished but it is uncommitted"
>> state.
>
> That's probably what happened.
I do not understand. Can someone please explain to me why a bazaar
user have to take care of this?
next prev parent reply other threads:[~2010-01-16 9:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 22:27 Help me unstick my bzr, please Alan Mackenzie
2010-01-16 2:37 ` 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 [this message]
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=e01d8a51001160116h75232865m97635a0f5f19cacf@mail.gmail.com \
--to=lennart.borgman@gmail.com \
--cc=acm@muc.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=keramida@ceid.upatras.gr \
/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).