From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: ofv@wanadoo.es, oscarfv@telefonica.net, emacs-devel@gnu.org
Subject: Re: Strange response after merge from upstream
Date: Wed, 02 Dec 2009 19:40:42 +0200 [thread overview]
Message-ID: <83ocmhl1et.fsf@gnu.org> (raw)
In-Reply-To: <jwvaay130va.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: =?iso-8859-1?Q?=D3scar?= Fuentes <oscarfv@telefonica.net>,
> ofv@wanadoo.es, emacs-devel@gnu.org
> Date: Wed, 02 Dec 2009 09:31:06 -0500
>
> > Thanks, these two followed by "bzr merge --pull" seem to have solved
> > the issue. I will use "merge --pull" from now on, as long as no
> > development goes on on quickfixes/, and see if it stays in sync.
>
> If the branch ever diverges, you won't be able to use `pull' again until
> you `push' that branch's changes upstream.
Yes, of course. But then I won't be surprised ;-)
next prev parent reply other threads:[~2009-12-02 17:40 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 [this message]
2009-12-02 6:14 ` Stephen J. Turnbull
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83ocmhl1et.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
--cc=ofv@wanadoo.es \
--cc=oscarfv@telefonica.net \
/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.