From: Eli Zaretskii <eliz@gnu.org>
To: "Stephen J. Turnbull" <stephen@xemacs.org>
Cc: 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:59:17 +0200 [thread overview]
Message-ID: <83eilqctne.fsf@gnu.org> (raw)
In-Reply-To: <87wrziqw61.fsf@uwakimon.sk.tsukuba.ac.jp>
> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Cc: Giorgos Keramidas <keramida@ceid.upatras.gr>,
> acm@muc.de,
> emacs-devel@gnu.org
> Date: Sat, 16 Jan 2010 17:41:10 +0900
>
> Eli Zaretskii writes:
>
> > Why not simply
> >
> > ~/emacs/emacs.bzr/quickfixes$ bzr merge --force
>
> Because Alan's commit will be a merge commit, not a regular commit.
> This probably won't confuse most humans, who will be looking at Alan's
> commit message, not at the parentage of the commit, but it might cause
> issues with DAG tracing tools like bisect.
For such a small change, I doubt if this is significant.
> It will also very likely cause Alan's commit to appear to be the
> mainline, and all of the commits he has merged to be a feature branch,
> in the logs and GUI DAG viewers.
Sorry, I don't understand what you mean by ``appear to be mainline''
and by ``commits [...] to be a feature branch''. Can you elaborate?
next prev parent reply other threads:[~2010-01-16 8:59 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 [this message]
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=83eilqctne.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=keramida@ceid.upatras.gr \
--cc=stephen@xemacs.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.