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: Wed, 01 Sep 2010 09:32:03 +0900 [thread overview]
Message-ID: <tl7y6bm1eyk.fsf@m17n.org> (raw)
In-Reply-To: <jwv1v9fey05.fsf-monnier+emacs@gnu.org> (message from Stefan Monnier on Tue, 31 Aug 2010 15:08:02 +0200)
In article <jwv1v9fey05.fsf-monnier+emacs@gnu.org>, Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
> > This is strange. The above step apparently merged more than
> > what I committed in emacs-23 branch. That commit was done
> > as this just before the above merge:
> Yes, "bzr merge" will merge all the changes from the upstream branch
> that haven't been merged yet. I.e. your command merged all the changes
> that had been applied to `emacs-23' but hadn't yet been merged to
> `trunk' (or `work'). That's why my original scenario started with:
> cd .../trunk
> bzr merge .../emacs-23
> <resolve&commit>
> so as to first merge other "pending" changes.
But, I didn't want to merge other "pending" changes.
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"?
---
Kenichi Handa
handa@m17n.org
next prev parent reply other threads:[~2010-09-01 0:32 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 [this message]
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=tl7y6bm1eyk.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 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.