unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Giorgos Keramidas <keramida@ceid.upatras.gr>
Cc: acm@muc.de, emacs-devel@gnu.org
Subject: Re: Help me unstick my bzr, please.
Date: Sat, 16 Jan 2010 09:48:51 +0200	[thread overview]
Message-ID: <83k4vicwws.fsf@gnu.org> (raw)
In-Reply-To: <87r5pqkc63.fsf@kobe.laptop>

> From: Giorgos Keramidas <keramida@ceid.upatras.gr>
> Date: Sat, 16 Jan 2010 04:37:24 +0200
> Cc: emacs-devel@gnu.org
> 
> > 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 think the easiest way to revert your local "quickfixes" branch to a
> known & sane state is something like:
> 
>     1. Keep a backup of the two files you modified.
>     2. Wipe the local quickfixes branch.
>     3. Re-create the quickfixes from trunk.
>     4. Overwre the two files in the new quickfixes branch.
>     5. Use "bzr diff" to inspect the changes.
>     6. Commit them with "bzr commit".

Why not simply

  ~/emacs/emacs.bzr/quickfixes$ bzr merge --force

?  Then Alan could continue with the normal quickfixes workflow:

  ~/emacs/emacs.bzr/quickfixes$ cd ../trunk
  ~/emacs/emacs.bzr/trunk$ bzr update
  ~/emacs/emacs.bzr/trunk$ bzr merge ../quickfixes
  ~/emacs/emacs.bzr/trunk$ bzr commit -m "Fixed bug #1234."

Are there any problems with using --force in this case?

(From the discussions on the Bazaar list, I understand that some very
near future version will make "bzr merge" display a warning when there
are uncommitted changes, instead of erroring out.  So the above would
happen for Alan anyway, in that future version.)




  reply	other threads:[~2010-01-16  7:48 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 [this message]
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=83k4vicwws.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=acm@muc.de \
    --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).