From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 18:37:03 +0100 [thread overview]
Message-ID: <87vd4fiq4g.fsf@telefonica.net> (raw)
In-Reply-To: jwvfwvjy76g.fsf-monnier+emacs@gnu.org
Stefan Monnier <monnier@IRO.UMontreal.CA> writes:
> It's difficult enough to make sure patches get installed in the right
> (emacs-23 or trunk) branch and to keep them in sync, that adding another
> branch would just add to the work.
> Using an ad-hoc script on the other hand would *reduce* the work.
Unless you end writing the Mythical Magic Script, the effects will be
the reverse: more complexity, more confusion, more mistakes.
>> BTW, do you realize that the script would end cherry-picking commits and
>> that bzr has no support for tracking cherry-picks? This way it is not
>> possible to easily track commits across branches.
>
> Of course that would end up doing cherry-picking, so what?
> We already do that by hand, so doing in from a script can't be worse.
The proposed branch would eliminate the need for cherry-picking, hence
improving the traceability of patches.
next prev parent reply other threads:[~2010-11-02 17:37 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
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 [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vd4fiq4g.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 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).