[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Changes to emacs-23 branch and the trunk
From: |
Kenichi Handa |
Subject: |
Re: Changes to emacs-23 branch and the trunk |
Date: |
Wed, 01 Sep 2010 09:32:03 +0900 |
In article <address@hidden>, Stefan Monnier <address@hidden> 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
address@hidden
- Re: Changes to emacs-23 branch and the trunk, (continued)
- Re: Changes to emacs-23 branch and the trunk, Chong Yidong, 2010/08/30
- Re: Changes to emacs-23 branch and the trunk, Stefan Monnier, 2010/08/30
- Re: Changes to emacs-23 branch and the trunk, Kenichi Handa, 2010/08/30
- Re: Changes to emacs-23 branch and the trunk, Stefan Monnier, 2010/08/31
- Re: Changes to emacs-23 branch and the trunk, Kenichi Handa, 2010/08/31
- Re: Changes to emacs-23 branch and the trunk, Andreas Schwab, 2010/08/31
- Re: Changes to emacs-23 branch and the trunk, Kenichi Handa, 2010/08/31
- Re: Changes to emacs-23 branch and the trunk, Eli Zaretskii, 2010/08/31
- Re: Changes to emacs-23 branch and the trunk, Stefan Monnier, 2010/08/31
- Re: Changes to emacs-23 branch and the trunk,
Kenichi Handa <=