From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Alexander Belchenko <bialix@ukr.net>, emacs-devel@gnu.org
Subject: Re: Strange response after merge from upstream
Date: Wed, 02 Dec 2009 15:14:24 +0900 [thread overview]
Message-ID: <87pr6xvr5r.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <83skbuko4g.fsf@gnu.org>
Eli Zaretskii writes:
> How is "merge --pull" different from merge followed by commit?
> would it avoid the "1 extra revision" in the output of "missing"?
Maybe.
- "bzr merge" always merges, and you must commit.
- "bzr pull" does a trivial merge and commit if your local branch's
tip revision is an ancestor of the remote revision, otherwise it
aborts without changing anything. (A successful pull is also called
a "fast forward".)
- "bzr merge --pull" does the equivalent of "bzr pull" if possible,
otherwise it does "bzr merge". This means you will have to commit
separately when your local branch contains unpushed changes even if
you get a clean merge; only for a fast forward do you avoid the
commit step.
The above assumes there are no uncommitted local changes. If there
are, all of the above commands abort without doing anything.
next prev parent reply other threads:[~2009-12-02 6:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 19:20 Strange response after merge from upstream Eli Zaretskii
2009-12-01 22:04 ` Stefan Monnier
2009-12-01 22:21 ` Andreas Schwab
2009-12-02 1:54 ` Stefan Monnier
2009-12-02 2:09 ` Óscar Fuentes
2009-12-02 4:29 ` Stefan Monnier
2009-12-02 10:48 ` Andreas Schwab
2009-12-01 22:23 ` Alexander Belchenko
2009-12-02 4:15 ` Eli Zaretskii
2009-12-02 4:56 ` Óscar Fuentes
2009-12-02 5:58 ` Eli Zaretskii
2009-12-02 6:26 ` Óscar Fuentes
2009-12-02 10:53 ` Eli Zaretskii
2009-12-02 14:31 ` Stefan Monnier
2009-12-02 17:40 ` Eli Zaretskii
2009-12-02 6:14 ` Stephen J. Turnbull [this message]
2009-12-02 7:05 ` Óscar Fuentes
2009-12-02 14:29 ` Stefan Monnier
2009-12-02 17:44 ` Óscar Fuentes
2009-12-02 19:37 ` Stefan Monnier
2009-12-02 17:55 ` Alexander Belchenko
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=87pr6xvr5r.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=bialix@ukr.net \
--cc=eliz@gnu.org \
--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).