From: Juanma Barranquero <lekktu@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: ofv@wanadoo.es, Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
Subject: Re: Installing changes from branches
Date: Sat, 3 Apr 2010 21:31:16 +0200 [thread overview]
Message-ID: <r2xf7ccd24b1004031231nea35c9c6s399b536842723906@mail.gmail.com> (raw)
In-Reply-To: <jwvy6h4mjvk.fsf-monnier+emacs@gnu.org>
On Sat, Apr 3, 2010 at 21:14, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
> Actually, IIUC (and last time I checked) this is not quite true, it's
> just a diff w.r.t the head of the branch from which you merge.
> I.e. if this "upstream" branch has been updated since you last merged,
> the diff will include the new changes on the "upstream" branch. :-(
>
> Hopefully someone will tell me I'm wrong,
I haven't tested it, but that's not what the doc (bzr help revisionspec) says:
submit:
Diffing against this shows all the changes that were made in this branch,
and is a good predictor of what merge will do. The submit branch is
used by the bundle and merge directive commands. If no submit branch
is specified, the parent branch is used instead.
The common ancestor is the last revision that existed in both
branches. Usually this is the branch point, but it could also be
a revision that was merged.
Examples:
$ bzr diff -r submit:
Juanma
next prev parent reply other threads:[~2010-04-03 19:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-03 1:05 Installing changes from branches Stefan Monnier
2010-04-03 1:37 ` Óscar Fuentes
2010-04-03 7:08 ` Eli Zaretskii
2010-04-03 13:56 ` Stefan Monnier
2010-04-03 14:19 ` Óscar Fuentes
2010-04-03 15:08 ` Eli Zaretskii
2010-04-03 15:14 ` Óscar Fuentes
2010-04-03 15:54 ` Eli Zaretskii
2010-04-03 2:26 ` Juanma Barranquero
2010-04-03 8:56 ` Jan Djärv
2010-04-03 9:17 ` Stephen J. Turnbull
2010-04-03 14:08 ` Stefan Monnier
2010-04-03 14:30 ` Óscar Fuentes
2010-04-03 15:18 ` Jan Djärv
2010-04-03 15:41 ` Óscar Fuentes
2010-04-03 16:29 ` Eli Zaretskii
2010-04-03 16:49 ` Eli Zaretskii
2010-04-03 16:56 ` Óscar Fuentes
2010-04-03 20:53 ` Eli Zaretskii
2010-04-03 21:13 ` Óscar Fuentes
2010-04-03 19:14 ` Stefan Monnier
2010-04-03 19:31 ` Juanma Barranquero [this message]
2010-04-03 20:47 ` Eli Zaretskii
2010-04-03 22:57 ` Juri Linkov
2010-04-04 6:33 ` Eli Zaretskii
2010-04-04 11:03 ` Juri Linkov
2010-04-04 14:16 ` Stefan Monnier
2010-04-04 14:18 ` Stefan Monnier
2010-04-04 14:57 ` Eli Zaretskii
2010-04-05 14:02 ` Stefan Monnier
2010-04-04 14:58 ` 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=r2xf7ccd24b1004031231nea35c9c6s399b536842723906@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=ofv@wanadoo.es \
/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.