From: Kenichi Handa <handa@m17n.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Changes to emacs-23 branch and the trunk
Date: Thu, 02 Sep 2010 11:49:19 +0900 [thread overview]
Message-ID: <tl7bp8g272o.fsf@m17n.org> (raw)
In-Reply-To: <jwvvd6qaqz1.fsf-monnier+emacs@gnu.org> (message from Stefan Monnier on Wed, 01 Sep 2010 09:01:33 +0200)
In article <jwvvd6qaqz1.fsf-monnier+emacs@gnu.org>, Stefan Monnier <monnier@iro.umontreal.ca> writes:
>>> so as to first merge other "pending" changes.
> > But, I didn't want to merge other "pending" changes.
> You have to merge them before you merge yours,
My original hope was to avoid that, but now I understand
that is necessary.
> > Anyway, I've already merged them in my working directory
> > "work". What should I do? May I commit all of them (after
> > resolving conflicts) to the trunk at once with the commit
> > message something like "merge changes in emacs-23 branches"?
> Yes.
Just done.
By the way, when I do "bzr merge" in "work" directory, now
it tries to merge from emacs-23 branch with this message:
Merging from remembered submit location /usr/local/work/emacs/emacs-23/
Previously it tried to merge from trunk with this message:
Merging from remembered parent location /usr/local/work/emacs/trunk/
How can I recover that behaviour?
---
Kenichi Handa
handa@m17n.org
next prev parent reply other threads:[~2010-09-02 2:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 8:20 Changes to emacs-23 branch and the trunk Kenichi Handa
2010-08-30 14:19 ` Chong Yidong
2010-08-30 20:20 ` Juanma Barranquero
2010-09-14 15:03 ` Juanma Barranquero
2010-09-16 22:33 ` Chong Yidong
2010-09-17 15:09 ` Juanma Barranquero
2010-08-30 16:03 ` Stefan Monnier
2010-08-31 1:54 ` Kenichi Handa
2010-08-31 8:43 ` Stefan Monnier
2010-08-31 11:44 ` Kenichi Handa
2010-08-31 11:59 ` Andreas Schwab
2010-08-31 12:37 ` Kenichi Handa
2010-08-31 17:05 ` Eli Zaretskii
2010-08-31 13:08 ` Stefan Monnier
2010-09-01 0:32 ` Kenichi Handa
2010-09-01 7:01 ` Stefan Monnier
2010-09-02 2:49 ` Kenichi Handa [this message]
2010-09-02 5:07 ` Eli Zaretskii
2010-09-02 5:33 ` Kenichi Handa
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=tl7bp8g272o.fsf@m17n.org \
--to=handa@m17n.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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).