From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 19:56:29 +0100 [thread overview]
Message-ID: <87fwvjimg2.fsf@telefonica.net> (raw)
In-Reply-To: 87eib3wp4j.fsf@uwakimon.sk.tsukuba.ac.jp
"Stephen J. Turnbull" <stephen@xemacs.org> writes:
> > Adding an extra branch does not increase the current workload.
>
> Of course it does. Most occasional developers work only on the branch
> that they use every day, either trunk or stable/maintenance. That's
> where they test, that's where they refine. Adding the common-fixes
> branch means they need to clone and maintain that branch, and work in
> a branch that they don't use.
Almost every change on emacs-23 is intended to trunk too. Right now
those changes that are exclusive to emacs-23 must be flagged
somehow. Adding common-fixes just means that people working on emacs-23
will work on common-fixes, except for those cases where they would flag
the change as belonging to emacs-23 only. Not so hard, IMO.
> Even for frequent contributors who help with porting patches back and
> forth between the branches, this requires more thinking about where
> you should do the work.
Uh? With common-fixes you merge the commits there into emacs-23 and
trunk. That's all.
> > They would commit to common-fixes the same way they do for emacs-23.
>
> You mean, stuff that doesn't belong there, as started this thread? ;-)
The problem was that commits intended to emacs-23 were merged into
trunk. Yes, people can do all kinds of mistakes, but no script will
magically avoid them.
[snip]
> > when there are standard practices on dVCS for properly solving the
> > problem at hand.
>
> But there aren't. Only Darcs supports cherry-picking properly.
You are missing the point. common-fixes will eliminate the need for
cherry-picking (and for examining each commit on emacs-23 before merging
into trunk). The maintainers save time and the VC history is consistent
(with commits maintaining its identity on the branches where they are
installed)
[snip]
next prev parent reply other threads:[~2010-11-02 18:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-01 13:48 Incorrect merge Ken Brown
2010-11-01 15:46 ` Chong Yidong
2010-11-01 16:02 ` Chong Yidong
2010-11-01 17:54 ` Eli Zaretskii
2010-11-01 20:21 ` Juanma Barranquero
2010-11-01 20:37 ` Eli Zaretskii
2010-11-01 22:19 ` Juanma Barranquero
2010-11-02 1:50 ` Stephen J. Turnbull
2010-11-02 14:54 ` Stefan Monnier
2010-11-02 15:57 ` Óscar Fuentes
2010-11-02 16:45 ` Stephen J. Turnbull
2010-11-02 17:14 ` Óscar Fuentes
2010-11-02 18:34 ` Stephen J. Turnbull
2010-11-02 18:56 ` Óscar Fuentes [this message]
2010-11-02 20:25 ` Stephen J. Turnbull
2010-11-02 20:44 ` Óscar Fuentes
2010-11-03 5:22 ` Stephen J. Turnbull
2010-11-03 6:46 ` Óscar Fuentes
2010-11-03 7:44 ` Stephen J. Turnbull
2010-11-03 13:51 ` Stefan Monnier
2010-11-04 20:16 ` Lars Magne Ingebrigtsen
2010-11-05 9:30 ` Andreas Schwab
2010-11-05 11:42 ` Eli Zaretskii
2010-11-08 16:03 ` Stefan Monnier
2010-11-03 6:52 ` Óscar Fuentes
2010-11-03 7:47 ` Stephen J. Turnbull
2010-11-02 17:22 ` Stefan Monnier
2010-11-02 17:37 ` Óscar Fuentes
2010-11-02 18:38 ` Eli Zaretskii
2010-11-02 19:19 ` Óscar Fuentes
2010-11-02 21:21 ` Stefan Monnier
2010-11-01 23:02 ` Óscar Fuentes
2010-11-02 1:29 ` Jason Rumney
2010-11-02 5:16 ` Óscar Fuentes
2010-11-02 9:16 ` Andreas Schwab
2010-11-02 14:17 ` Óscar Fuentes
2010-11-02 17:24 ` Stefan Monnier
2010-11-02 17:41 ` Óscar Fuentes
2010-11-02 17:44 ` Davis Herring
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=87fwvjimg2.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.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.