all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Stephen J. Turnbull" <stephen@xemacs.org>
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 17:29:30 +0900	[thread overview]
Message-ID: <87wrzio3kl.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <83k4vicwws.fsf@gnu.org>

Eli Zaretskii writes:

 > Why not simply
 > 
 >   ~/emacs/emacs.bzr/quickfixes$ bzr merge --force
 > 
 > ?  Then Alan could continue with the normal quickfixes workflow:

Because IIUC the situation correctly, Alan's work would show up as a
merge commit, not as a commit to a branch.  IOW, in the logs (or a
graphical DAG viewer) it would look like he was resolving conflicts in
the merge of those commits, not committing new work.

For tiny changes this is a pretty pedantic distinction, and for humans
the log message would probably make what happened clear.

For larger changes, this could cause problems (ie, less accurate
localization of the responsible change) using tools like bisect; I'd
have to think about it.





  reply	other threads:[~2010-01-16  8:29 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 [this message]
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wrzio3kl.fsf@uwakimon.sk.tsukuba.ac.jp \
    --to=stephen@xemacs.org \
    --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 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.