unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: ofv@wanadoo.es, emacs-devel@gnu.org
Subject: Re: Installing changes from branches
Date: Sat, 03 Apr 2010 15:14:25 -0400	[thread overview]
Message-ID: <jwvy6h4mjvk.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <838w941nxh.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 03 Apr 2010 19:49:30 +0300")

>    bzr diff -rsubmit: > ../foo

> The revision designated by `submit:' is the last common ancestor
> between the trunk and the test branch,

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,


        Stefan




  parent reply	other threads:[~2010-04-03 19:14 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 [this message]
2010-04-03 19:31               ` Juanma Barranquero
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

  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=jwvy6h4mjvk.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --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 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).