From: David Reitter <david.reitter@gmail.com>
To: esr@thyrsus.com
Cc: emacs-devel@gnu.org
Subject: Re: Progress on the git repo cleanup
Date: Thu, 6 Mar 2014 16:34:15 -0500 [thread overview]
Message-ID: <0B467D92-8B0C-46AE-98D7-8859D54F19DB@gmail.com> (raw)
In-Reply-To: <20140306204950.GA28857@thyrsus.com>
[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]
On Mar 6, 2014, at 3:49 PM, Eric S. Raymond <esr@thyrsus.com> wrote:
> David Reitter <david.reitter@gmail.com>:
>> What is the procedure for those of us that keep a separate branch
>> around, which has multiple (50+) merges from the mainline or Emacs
>> 23, and many private changes?
>
> The first question you need to settle is whether you need to keep the
> change comments for your branch.
I started Aquamacs 9 years ago, and I have about 5 years worth of history in the branch. I have been careful to be a good citizen in committing reasonably logical and documented changes that can be merged into the main branch.
No, I don’t want to lose my history.
> If not, the procedure is very simple:
If it weren’t for your dedicated and hard work while communicating with everyone here, I would find it somewhat insulting to be given this trivial “trash the history” solution.
> If you need to keep the change comments, Andreas has a more complicated
> procedure in mind which I will help him set up.
I’m very much looking forward to this.
Can I provide you with a reasonably complex test case?
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4151 bytes --]
next prev parent reply other threads:[~2014-03-06 21:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-06 18:21 Progress on the git repo cleanup Eric S. Raymond
2014-03-06 19:53 ` David Reitter
2014-03-06 20:15 ` Andreas Schwab
2014-03-06 20:24 ` David Reitter
2014-03-06 20:49 ` Eric S. Raymond
2014-03-06 21:34 ` David Reitter [this message]
2014-03-06 22:00 ` Eric S. Raymond
2014-03-06 22:13 ` David Reitter
2014-03-06 22:31 ` Andreas Schwab
2014-03-06 22:46 ` Eric S. Raymond
2014-03-12 17:46 ` Andreas Schwab
2014-03-12 17:57 ` Eric S. Raymond
2014-03-12 18:07 ` Karl Fogel
2014-03-12 18:30 ` Eric S. Raymond
2014-03-12 19:38 ` Karl Fogel
2014-03-12 21:18 ` David Kastrup
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=0B467D92-8B0C-46AE-98D7-8859D54F19DB@gmail.com \
--to=david.reitter@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=esr@thyrsus.com \
/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.