From: David Reitter <david.reitter@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: "emacs-devel@gnu.org discussions" <emacs-devel@gnu.org>
Subject: Re: git archive no longer being updated?
Date: Thu, 7 Jan 2010 10:43:58 -0500 [thread overview]
Message-ID: <FE2E65BD-732C-429E-AC17-D005AD4CCA5F@gmail.com> (raw)
In-Reply-To: <m2bphdl9a9.fsf@igel.home>
On Jan 1, 2010, at 6:01 PM, Andreas Schwab wrote:
> You can follow the mirror at repo.or.cz, but it is only updated
> manually.
I've been trying it out and I'm having some issues with this wrt. my downstream branches, which have been based on the official mirror on Savannah until Dec 27.
Now, I can merge yours and the old SV mirror using the 'ours' strategy. This works in that is creates a common ancestor with the downstream branches, so I can merge the resulting branch downstream.
However, it is kind of ugly since git-log then shows commits from both the Savannah and the .Cz branch, even though the commits were functionally equivalent. It's logical, but it keeps 100k redundant commits around.
Would it not be possible to rebase the new changes on top of the old branches, or directly do the fast-import with the previous repository from Savannah? Or are there disadvantages to the old conversion?
(I haven't figured out how to use rebase without common ancestors, so I haven't tried it out.)
next prev parent reply other threads:[~2010-01-07 15:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-01 22:46 git archive no longer being updated? Randal L. Schwartz
2010-01-01 23:01 ` Andreas Schwab
2010-01-01 23:02 ` Randal L. Schwartz
2010-01-01 23:49 ` Andreas Schwab
2010-01-01 23:53 ` Randal L. Schwartz
2010-01-10 9:51 ` Jim Meyering
2010-01-10 14:02 ` Giuseppe Scrivano
2010-01-10 14:09 ` David Reitter
2010-01-11 2:26 ` Stephen J. Turnbull
2010-01-11 4:27 ` David Reitter
2010-01-10 14:17 ` Jim Meyering
2010-01-07 15:43 ` David Reitter [this message]
2010-01-07 16:24 ` Andreas Schwab
2010-01-12 19:22 ` David Reitter
2010-01-07 20:10 ` Stefan Monnier
2010-01-08 22:15 ` David Reitter
2010-01-08 23:15 ` Andreas Schwab
2010-01-09 3:49 ` Miles Bader
2010-01-09 9:38 ` Andreas Schwab
2010-01-09 13:17 ` Miles Bader
2010-01-09 16:23 ` Andreas Schwab
2010-01-09 23:46 ` Jason Rumney
2010-01-10 0:21 ` Miles Bader
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=FE2E65BD-732C-429E-AC17-D005AD4CCA5F@gmail.com \
--to=david.reitter@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.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).