all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Eric S. Raymond" <esr@thyrsus.com>
To: David Reitter <david.reitter@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: Progress on the git repo cleanup
Date: Thu, 6 Mar 2014 15:49:50 -0500	[thread overview]
Message-ID: <20140306204950.GA28857@thyrsus.com> (raw)
In-Reply-To: <7A33D431-2709-4086-87B4-420C6B39148C@gmail.com>

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.  If not, the procedure is very simple:

1. New repo is put up.

2. You pull it.

3. You start a new branch.

4. You rm -fr and copy in your version.

5. You commit and push it, creating a new branch in the master repo.

If you need to keep the change comments, Andreas has a more complicated 
procedure in mind which I will help him set up.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>



  parent reply	other threads:[~2014-03-06 20:49 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 [this message]
2014-03-06 21:34     ` David Reitter
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=20140306204950.GA28857@thyrsus.com \
    --to=esr@thyrsus.com \
    --cc=david.reitter@gmail.com \
    --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 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.