From: David Reitter <david.reitter@gmail.com>
To: Andreas Schwab <schwab@linux-m68k.org>,
"emacs-devel@gnu.org discussions" <emacs-devel@gnu.org>
Subject: Re: git archive no longer being updated?
Date: Tue, 12 Jan 2010 14:22:53 -0500 [thread overview]
Message-ID: <C19120F6-45E8-4E1E-A22B-C280F32A089F@gmail.com> (raw)
In-Reply-To: <m2637dyjav.fsf@igel.home>
[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]
On Jan 7, 2010, at 11:24 AM, Andreas Schwab wrote:
> David Reitter <david.reitter@gmail.com> writes:
>
>> 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.
>
> Just rebase your changes on top of the new tree.
Not that simple, because there have been many changes interspersed with (conflict-laden) merges from upstream, plus I have a number of topic branches.
What I have done now is to extract alignment information from the old and new git branches for the year 2009, and I have a script that produces "grafts" to map all my merges to the new upstream branch to pretend that that's how they happened.
I can, later, rewrite everything to reflect the new state of affairs.
I've described the method here in case anyone can make use of it:
http://thread.gmane.org/gmane.comp.version-control.git/136377/focus=136387
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 203 bytes --]
next prev parent reply other threads:[~2010-01-12 19:22 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
2010-01-07 16:24 ` Andreas Schwab
2010-01-12 19:22 ` David Reitter [this message]
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=C19120F6-45E8-4E1E-A22B-C280F32A089F@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).