From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: bzg@gnu.org, emacs-devel@gnu.org
Subject: Re: patch vs. overwrite in bzr
Date: Thu, 05 Apr 2012 06:09:56 +0300 [thread overview]
Message-ID: <8362dedgcb.fsf@gnu.org> (raw)
In-Reply-To: <jwvhawzm9y6.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: bzg@gnu.org, emacs-devel@gnu.org
> Date: Wed, 04 Apr 2012 18:06:19 -0400
>
> > Would the problem be solved if such cherry-picking weren't needed?
>
> To a large extent, yes, but the cases we're talking about can't do that
> (which is why we're talking about that).
If this is the primary reason for problems, then in my experience this
is the first problem to tackle. Whatever the issues are that cause
the branches to be different, they should be regarded as secondary,
and solutions found for them that let the branches become not
different.
> > That is, if the branches were exactly identical, but kept in two
> > different VCSes? If this would solve the problem, then that's what
> > I'd suggest doing. After all, all those differences sound very minor;
> > e.g., why not rename the files as the other guy does?
>
> The `emacs' branch includes tons of other things that aren't in the
> `org' branch for obvious reasons.
Why should Org maintainers care about things they don't need? Let
them be there, they will do no harm at all.
next prev parent reply other threads:[~2012-04-05 3:09 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 13:28 Next pretest, and regressions policy Chong Yidong
2012-03-31 10:15 ` Bastien
2012-04-01 9:55 ` Bastien
2012-04-01 12:37 ` =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-01 13:30 ` Stefan Monnier
2012-04-01 17:09 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-02 4:12 ` Chong Yidong
2012-04-01 20:32 ` Bastien
2012-04-03 8:20 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Roland Winkler
2012-04-03 12:36 ` Óscar Fuentes
2012-04-03 13:42 ` Bastien
2012-04-03 15:02 ` patch vs. overwrite in bzr =?utf-8?Q?=C3=93scar_Fuentes?=
2012-04-03 15:03 ` David Engster
2012-04-03 16:31 ` Stefan Monnier
2012-04-03 17:40 ` Michael Albinus
2012-04-03 15:32 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Stefan Monnier
2012-04-03 16:52 ` patch vs. overwrite in bzr Glenn Morris
2012-04-03 20:50 ` Bastien
2012-04-03 21:27 ` Glenn Morris
2012-04-04 0:26 ` Stefan Monnier
2012-04-04 5:45 ` Bastien
2012-04-04 5:51 ` Bastien
2012-04-04 6:46 ` Michael Albinus
2012-04-04 8:35 ` Thierry Volpiatto
2012-04-04 13:20 ` Stefan Monnier
2012-04-04 16:39 ` Jordi Gutiérrez Hermoso
2012-04-04 16:52 ` Paul Eggert
2012-04-04 17:09 ` Eli Zaretskii
2012-04-04 17:53 ` Thierry Volpiatto
2012-04-04 19:07 ` Eli Zaretskii
2012-04-04 19:38 ` Thierry Volpiatto
2012-04-04 20:12 ` Eli Zaretskii
2012-04-04 13:16 ` Stefan Monnier
2012-04-04 17:01 ` Eli Zaretskii
2012-04-04 18:07 ` Stefan Monnier
2012-04-04 19:11 ` Eli Zaretskii
2012-04-04 20:11 ` David Engster
2012-04-04 22:06 ` Stefan Monnier
2012-04-05 3:09 ` Eli Zaretskii [this message]
2012-04-05 13:22 ` Stefan Monnier
2012-04-05 15:24 ` Lars Magne Ingebrigtsen
2012-04-05 15:57 ` Eli Zaretskii
2012-04-05 17:10 ` Ted Zlatanov
2012-04-06 7:13 ` Richard Stallman
2012-04-06 8:29 ` Bastien
2012-04-06 8:40 ` Eli Zaretskii
2012-04-06 9:20 ` Bastien
2012-04-06 9:57 ` Eli Zaretskii
2012-04-06 10:20 ` Bastien
2012-04-06 17:26 ` chad
2012-04-06 20:01 ` joakim
2012-04-06 20:52 ` Eli Zaretskii
2012-04-07 2:28 ` Óscar Fuentes
2012-04-07 6:33 ` Eli Zaretskii
2012-04-07 11:56 ` Óscar Fuentes
2012-04-07 12:10 ` Eli Zaretskii
2012-04-07 12:56 ` Óscar Fuentes
2012-04-07 13:32 ` Eli Zaretskii
2012-04-07 13:42 ` Óscar Fuentes
2012-04-07 7:07 ` Andreas Schwab
2012-04-07 11:44 ` Óscar Fuentes
2012-04-06 21:10 ` Juanma Barranquero
2012-04-16 10:45 ` Jason Rumney
2012-04-16 16:38 ` Eli Zaretskii
2012-04-06 16:17 ` Christophe Poncy
2012-04-06 16:41 ` Eli Zaretskii
2012-04-06 17:14 ` Christophe Poncy
2012-04-07 0:17 ` Richard Stallman
2012-04-07 0:17 ` Richard Stallman
2012-04-07 9:15 ` Bastien
2012-04-07 22:19 ` Richard Stallman
2012-04-09 9:39 ` Bastien
2012-04-08 3:25 ` Richard Stallman
2012-04-08 15:52 ` Ted Zlatanov
2012-04-16 22:02 ` Richard Stallman
2012-04-06 8:43 ` Eli Zaretskii
2012-04-04 17:12 ` patch vs. overwrite in bzr [was: Next pretest, and regressions policy] Eli Zaretskii
2012-04-05 7:13 ` Bastien
2012-04-05 15:53 ` Eli Zaretskii
2012-04-11 14:36 ` Bastien
2012-04-04 18:01 ` Thierry Volpiatto
2012-04-05 7:19 ` Bastien
2012-04-05 9:16 ` Thierry Volpiatto
2012-04-01 20:35 ` Next pretest, and regressions policy Bastien
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=8362dedgcb.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=bzg@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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).