From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: Workflow to accumulate individual changes?
Date: Thu, 31 Dec 2009 02:04:40 +0100 [thread overview]
Message-ID: <873a2slzrr.fsf@telefonica.net> (raw)
In-Reply-To: f7ccd24b0912301557s7e40ab26h8ee88c630757c1ce@mail.gmail.com
Juanma Barranquero <lekktu@gmail.com> writes:
> Anyway, after thinking about the issue, I'm not sure it'd work,
> because of ChangeLog.
[snip]
> # dates in ChangeLog are wrong, so you need an additional commit to
> fix the ChangeLog entries
>
> so it only really works for fixes that do not need ChangeLog entries.
Thinking a bit more about this...
`rebase' stops if it finds conflicts, then you need to resolve the
conflicts (i.e. edit the conflicted changes) and continue the rebase.
If somehow the rebase finds a conflict on the ChangeLog for every
rebased revision, you could fix the dates. I know by experience that
Subversion generates a conflict every time two changes append lines to a
file. If bzr generates a conflict when two changes happen at the top of
the ChangeLog file, you could arrange things for this to happen: the
first revision should conflict right away; for the second revision to
conflict, you'll need to leave the top of the ChangeLog on a way that it
can't merge the second revision, etc.
--
Óscar
next prev parent reply other threads:[~2009-12-31 1:04 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 [this message]
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
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
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=873a2slzrr.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).