From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Kenichi Handa <handa@m17n.org>
Cc: emacs-devel@gnu.org
Subject: Re: Changes to emacs-23 branch and the trunk
Date: Mon, 30 Aug 2010 18:03:14 +0200 [thread overview]
Message-ID: <jwvlj7oks6c.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <tl7bp8k3412.fsf@m17n.org> (Kenichi Handa's message of "Mon, 30 Aug 2010 17:20:41 +0900")
> I'm going to fix the display-table related problem in
> emacs-23 branch. But, the diff of the change will conflict
> with the trunk code. As I'm afraid that it's not a simple
> work to resolve that confliction, I want to apply the same
> change to the trunk code by myself.
It's basically easy:
cd .../trunk
bzr merge .../emacs-23
<resolve&commit>
cd .../emacs-23
<make-change>
bzr commit -m ...
cd .../trunk
bzr merge .../emacs-23
bzr revert .
<make-the-change-by-hand>
bzr commit -m "Merge by hand from emacs-23"
The first part just updates the trunk w.r.t emacs-23 so that when you do
the "bzr merge" after installing your change, you only get your own
change, rather than a bunch of others.
Note that rather than
bzr revert .
<make-the-change-by-hand>
you may want to check the conflict that Bzr gives you: it may turn out
to be just as easy to resolve it by hand than to undo&redo.
Stefan
next prev parent reply other threads:[~2010-08-30 16:03 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 [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvlj7oks6c.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=handa@m17n.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 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.