* emacs-24 r107805: international/characters.el: Fix sorting.
@ 2012-04-10 16:55 Eli Zaretskii
2012-04-10 17:23 ` Glenn Morris
2012-04-10 18:57 ` Andreas Schwab
0 siblings, 2 replies; 8+ messages in thread
From: Eli Zaretskii @ 2012-04-10 16:55 UTC (permalink / raw)
To: Andreas Schwab; +Cc: emacs-devel
Andreas, if you want to change things in this area, please either make
the same changes on the trunk, or remove your latest changes from the
trunk, and let the next merge add them. The way you do it you make
the future merge from the branch harder, because there will be
conflicts.
TIA
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: emacs-24 r107805: international/characters.el: Fix sorting.
2012-04-10 16:55 emacs-24 r107805: international/characters.el: Fix sorting Eli Zaretskii
@ 2012-04-10 17:23 ` Glenn Morris
2012-04-10 18:19 ` Eli Zaretskii
2012-04-10 18:37 ` Stefan Monnier
2012-04-10 18:57 ` Andreas Schwab
1 sibling, 2 replies; 8+ messages in thread
From: Glenn Morris @ 2012-04-10 17:23 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Andreas Schwab, emacs-devel
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?
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: emacs-24 r107805: international/characters.el: Fix sorting.
2012-04-10 17:23 ` Glenn Morris
@ 2012-04-10 18:19 ` Eli Zaretskii
2012-04-10 18:37 ` Stefan Monnier
1 sibling, 0 replies; 8+ messages in thread
From: Eli Zaretskii @ 2012-04-10 18:19 UTC (permalink / raw)
To: Glenn Morris; +Cc: schwab, emacs-devel
> From: Glenn Morris <rgm@gnu.org>
> Cc: Andreas Schwab <schwab@linux-m68k.org>, emacs-devel@gnu.org
> Date: Tue, 10 Apr 2012 13:23:26 -0400
>
> 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.
I did:
107803: Andreas Schwab 2012-04-10 Copy changes from trunk revision 107818 to fix letter-case pairs.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: emacs-24 r107805: international/characters.el: Fix sorting.
2012-04-10 17:23 ` Glenn Morris
2012-04-10 18:19 ` Eli Zaretskii
@ 2012-04-10 18:37 ` Stefan Monnier
1 sibling, 0 replies; 8+ messages in thread
From: Stefan Monnier @ 2012-04-10 18:37 UTC (permalink / raw)
To: Glenn Morris; +Cc: Eli Zaretskii, Andreas Schwab, emacs-devel
> 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.
Yes, but better not abuse this.
> After 24.1 is released, trunk will be merged to emacs-24 in preparation
> for making 24.2 on the emacs-24 branch.
"After", yes, but not "right after". IOW rather than "after 24.1", I'd
say "before the 24.2 release".
> In the meantime, emacs-24 can be merged to the trunk at any time.
Yes.
Stefan
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: emacs-24 r107805: international/characters.el: Fix sorting.
2012-04-10 16:55 emacs-24 r107805: international/characters.el: Fix sorting Eli Zaretskii
2012-04-10 17:23 ` Glenn Morris
@ 2012-04-10 18:57 ` Andreas Schwab
2012-04-10 19:09 ` Eli Zaretskii
1 sibling, 1 reply; 8+ messages in thread
From: Andreas Schwab @ 2012-04-10 18:57 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: emacs-devel
Eli Zaretskii <eliz@gnu.org> writes:
> Andreas, if you want to change things in this area, please either make
> the same changes on the trunk,
No. Commits should be merged, not copied.
> The way you do it you make the future merge from the branch harder,
> because there will be conflicts.
You were the one to introduce the conflict.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: emacs-24 r107805: international/characters.el: Fix sorting.
2012-04-10 18:57 ` Andreas Schwab
@ 2012-04-10 19:09 ` Eli Zaretskii
2012-04-10 20:52 ` Andreas Schwab
0 siblings, 1 reply; 8+ messages in thread
From: Eli Zaretskii @ 2012-04-10 19:09 UTC (permalink / raw)
To: Andreas Schwab; +Cc: emacs-devel
> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: emacs-devel@gnu.org
> Date: Tue, 10 Apr 2012 20:57:17 +0200
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> > Andreas, if you want to change things in this area, please either make
> > the same changes on the trunk,
>
> No. Commits should be merged, not copied.
Then please remove the trunk changes.
> > The way you do it you make the future merge from the branch harder,
> > because there will be conflicts.
>
> You were the one to introduce the conflict.
Actually, I fixed it. But suit yourself.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-04-11 6:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-10 16:55 emacs-24 r107805: international/characters.el: Fix sorting Eli Zaretskii
2012-04-10 17:23 ` Glenn Morris
2012-04-10 18:19 ` Eli Zaretskii
2012-04-10 18:37 ` Stefan Monnier
2012-04-10 18:57 ` Andreas Schwab
2012-04-10 19:09 ` Eli Zaretskii
2012-04-10 20:52 ` Andreas Schwab
2012-04-11 6:46 ` Eli Zaretskii
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).