From: Eli Zaretskii <eliz@gnu.org>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: ofv@wanadoo.es, emacs-devel@gnu.org
Subject: Re: Workflow to accumulate individual changes?
Date: Thu, 31 Dec 2009 05:44:08 -0500 [thread overview]
Message-ID: <E1NQIVk-0007yV-LC@fencepost.gnu.org> (raw)
In-Reply-To: <f7ccd24b0912302036y51436f47p164fe640f926cfb7@mail.gmail.com> (message from Juanma Barranquero on Thu, 31 Dec 2009 05:36:30 +0100)
From: Eli Zaretskii <eliz@gnu.org>
To: Juanma Barranquero <lekktu@gmail.com>
CC: ofv@wanadoo.es, emacs-devel@gnu.org
In-reply-to: <f7ccd24b0912302036y51436f47p164fe640f926cfb7@mail.gmail.com>
(message from Juanma Barranquero on Thu, 31 Dec 2009 05:36:30 +0100)
Subject: Re: Workflow to accumulate individual changes?
Reply-to: Eli Zaretskii <eliz@gnu.org>
References: <f7ccd24b0912301334u6df4cf24k7625713ba8e4252@mail.gmail.com>
<87fx6sm8yl.fsf@telefonica.net> <f7ccd24b0912301557s7e40ab26h8ee88c630757c1ce@mail.gmail.com>
<873a2slzrr.fsf@telefonica.net> <f7ccd24b0912301733k510c6bbaub97223dcf2565055@mail.gmail.com>
<83ws03db8v.fsf@gnu.org> <f7ccd24b0912302036y51436f47p164fe640f926cfb7@mail.gmail.com>
--text follows this line--
> From: Juanma Barranquero <lekktu@gmail.com>
> Date: Thu, 31 Dec 2009 05:36:30 +0100
> Cc: ofv@wanadoo.es, emacs-devel@gnu.org
>
> Personally, and with all due respect, I don't consider this: "There
> are many theoretical objections to rebasing, and I won’t rehash them
> here. There’s general consensus that rebasing is sort of icky." as a
> sort of expert opinion, just biased.
Me neither. I'm talking about the rest of the reasons, which _are_
described in detail.
> People used to git's rebase find it extremely useful.
I don't know anything about git, so I cannot talk about this. Just
remember that Stephen pointed to a posting by Linus who very
eloquently explained how rebasing is a bad idea in at least one
situation.
> Weren't I thinking that ChangeLog present problems that should be
> discussed, I wouldn't have brought the issue.
If ChangeLog maintenance is such a big problem, I think we should
resolve it here and now. Otherwise, it's a tail wagging the dog.
> > ChangeLog files will present a problem for feature branches and
> > quick-fix branches alike. Though an annoyance, I don't see how it is
> > a problem significant enough to recommend rebase as the main vehicle
> > of routine work, given the downside of rebasing (rewriting history
> > etc.).
> >
> > Am I missing something?
>
> Yes. Neither of us is "recommending rebase as the main vehicle of
> routine work". I was talking very specifically of a workflow I intend
> to use, but I have no idea how common it'll be for other people; and
> for my use, an interactive rebase would be a perfect option. I
> wouldn't dream of suggest Karl to discuss rebase on BzrForEmacsDevs,
> for example.
ChangeLog's are part of everyone's workflow (unless we decide to stop
using them). If we think ChangeLog's are causing significant
inconveniences that are not addressed in the recommended workflow, and
if rebasing is the recommended solution for that, then we had better
address these issues now, and by all means mention them on the wiki.
IOW, what annoys Juanma Barranquero, will probably annoy a few more,
so I would not dismiss that as Juanma's private problems whose
solution concerns no one but Juanma ;-)
next prev parent reply other threads:[~2009-12-31 10:44 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-30 21:34 Workflow to accumulate individual changes? Juanma Barranquero
2009-12-30 21:37 ` Juanma Barranquero
2009-12-30 21:46 ` Óscar Fuentes
2009-12-30 23:57 ` Juanma Barranquero
2009-12-31 0:21 ` Óscar Fuentes
2009-12-31 0:27 ` Juanma Barranquero
2009-12-31 1:04 ` Óscar Fuentes
2009-12-31 1:33 ` Juanma Barranquero
2009-12-31 1:48 ` Óscar Fuentes
2009-12-31 2:22 ` Juanma Barranquero
2009-12-31 4:21 ` Eli Zaretskii
2009-12-31 4:36 ` Juanma Barranquero
2009-12-31 5:12 ` Miles Bader
2009-12-31 10:15 ` Eli Zaretskii
2009-12-31 10:44 ` Eli Zaretskii [this message]
2009-12-31 12:37 ` Juanma Barranquero
2009-12-31 19:44 ` Karl Fogel
2009-12-31 20:16 ` Eli Zaretskii
2009-12-31 20:41 ` Juanma Barranquero
2010-01-01 2:54 ` Richard Stallman
2010-01-01 12:35 ` Stephen J. Turnbull
2010-01-01 13:49 ` Stephen J. Turnbull
2009-12-31 5:06 ` Óscar Fuentes
2009-12-31 10:26 ` Eli Zaretskii
2009-12-31 12:28 ` Juanma Barranquero
2009-12-31 18:27 ` Eli Zaretskii
2009-12-31 18:59 ` Óscar Fuentes
2009-12-31 20:39 ` Juanma Barranquero
2010-01-01 13:53 ` Stephen J. Turnbull
2010-01-01 14:38 ` Eli Zaretskii
2009-12-30 22:54 ` Giorgos Keramidas
2009-12-31 0:11 ` Juanma Barranquero
2009-12-31 9:21 ` Andreas Schwab
2009-12-31 10:11 ` Eli Zaretskii
2009-12-31 11:44 ` Andreas Schwab
2009-12-31 12:23 ` Eli Zaretskii
2009-12-31 12:38 ` Juanma Barranquero
2009-12-31 13:25 ` Eli Zaretskii
2009-12-31 13:37 ` Juanma Barranquero
2009-12-31 14:13 ` Eli Zaretskii
2009-12-31 13:43 ` Giorgos Keramidas
2009-12-31 13:53 ` Juanma Barranquero
2009-12-31 14:07 ` Alfred M. Szmidt
2009-12-31 14:16 ` Juanma Barranquero
2010-01-01 15:38 ` Alfred M. Szmidt
2010-01-01 17:53 ` David Kastrup
2010-01-01 2:55 ` Richard Stallman
2010-01-01 4:03 ` Óscar Fuentes
2010-01-01 8:41 ` Eli Zaretskii
2010-01-01 10:04 ` Óscar Fuentes
2010-01-02 15:44 ` Richard Stallman
2010-01-01 12:19 ` Andreas Schwab
2010-01-01 14:33 ` Eli Zaretskii
2010-01-01 14:48 ` Andreas Schwab
2010-01-01 19:18 ` Karl Fogel
2010-01-01 19:56 ` Eli Zaretskii
2010-01-01 20:09 ` Chong Yidong
2010-01-01 21:34 ` Eli Zaretskii
2010-01-01 20:13 ` Karl Fogel
2010-01-01 21:35 ` Eli Zaretskii
2010-01-01 21:25 ` Óscar Fuentes
2010-01-01 21:34 ` Eli Zaretskii
2010-01-01 22:58 ` Andreas Schwab
2010-01-01 20:07 ` Teemu Likonen
2010-01-01 20:12 ` Karl Fogel
2010-01-01 21:08 ` Teemu Likonen
2010-01-02 5:00 ` Stephen J. Turnbull
2010-01-02 5:12 ` Karl Fogel
2010-01-02 5:24 ` Miles Bader
2010-01-02 11:43 ` Juanma Barranquero
2010-01-02 12:09 ` Miles Bader
2010-01-02 19:22 ` Karl Fogel
2010-01-05 8:50 ` Stephen J. Turnbull
2010-01-02 4:37 ` Stephen J. Turnbull
2010-01-01 14:59 ` Stephen J. Turnbull
2010-01-01 15:30 ` Eli Zaretskii
2010-01-01 15:38 ` Alfred M. Szmidt
2009-12-31 14:08 ` David Kastrup
2009-12-31 19:47 ` Karl Fogel
2009-12-31 20:14 ` Chong Yidong
2009-12-31 20:36 ` Óscar Fuentes
2009-12-31 20:44 ` Juanma Barranquero
2009-12-31 14:12 ` Eli Zaretskii
2009-12-31 19:08 ` Stefan Monnier
2009-12-31 12:20 ` Juanma Barranquero
2010-01-01 12:33 ` Stephen J. Turnbull
2010-01-02 1:56 ` Juanma Barranquero
2010-01-02 2:28 ` Óscar Fuentes
2010-01-02 2:50 ` Juanma Barranquero
2010-01-02 9:11 ` Eli Zaretskii
2010-01-02 13:20 ` Juanma Barranquero
2010-01-02 13:17 ` Juanma Barranquero
2010-01-02 3:46 ` Stephen J. Turnbull
2010-01-02 9:10 ` Eli Zaretskii
2010-01-02 15:30 ` Stephen J. Turnbull
2010-01-02 17:05 ` Eli Zaretskii
2010-01-02 13:39 ` Juanma Barranquero
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=E1NQIVk-0007yV-LC@fencepost.gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=lekktu@gmail.com \
--cc=ofv@wanadoo.es \
/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.