[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: emacs-24 r107805: international/characters.el: Fix sorting.
|
From: |
Glenn Morris |
|
Subject: |
Re: emacs-24 r107805: international/characters.el: Fix sorting. |
|
Date: |
Tue, 10 Apr 2012 13:23:26 -0400 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Eli Zaretskii wrote:
> the future merge from the branch harder, because there will be
> conflicts.
This won't be (as much of) a problem if the commits to the emacs-24
branch are labelled as "backport from trunk" or "merge from trunk" when
appropriate. Basically anything that bzrmerge-skip-regexp can recognize.
BTW, to check my understanding:
After 24.1 is released, trunk will be merged to emacs-24 in preparation
for making 24.2 on the emacs-24 branch.
In the meantime, emacs-24 can be merged to the trunk at any time.
Is that right?