From: Michael Eager <eager@eagerm•com>
To: Stefan Beller <sbeller@google•com>
Cc: "git@vger•kernel.org" <git@vger•kernel.org>
Subject: Re: Best practices for updating old repos
Date: Thu, 15 Jun 2017 23:32:08 -0700 [thread overview]
Message-ID: <59437B68.5090601@eagerm.com> (raw)
In-Reply-To: <CAGZ79kZMCz9g7PW6km3gQJU5qipw27jvkVDXD64MUNKJykYZOw@mail.gmail.com>
On 06/15/2017 09:22 PM, Stefan Beller wrote:
> On Thu, Jun 15, 2017 at 5:52 PM, Michael Eager <eager@eagerm•com> wrote:
>
>> One other variant of the rebase approach I've thought of is to do
>> this incrementally, rebasing the old repo against an upstream commit
>> a short time after the old repo was forked, fixing any conflicts,
>> rebuilding and fixing build failures. Then repeat, with a bit
>> newer commit. Then repeat, until I get to the top. This sounds
>> tedious, but some of it can be automated. It also might result in
>> my making the changes compatible with upstream code which was later
>> abandoned or significantly changed.
>
> This sounds like
>
> https://github.com/mhagger/git-imerge
> https://www.youtube.com/watch?v=FMZ2_-Ny_zc
Thanks, Stefan. I'll look into this; it may be similar to what
I was thinking of doing. I'll have to watch the video.
--
Michael Eager eager@eagercon•com
1960 Park Blvd., Palo Alto, CA 94306 650-325-8077
next prev parent reply other threads:[~2017-06-16 6:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 0:52 Best practices for updating old repos Michael Eager
2017-06-16 4:22 ` Stefan Beller
2017-06-16 6:32 ` Michael Eager [this message]
[not found] ` <CAGUfqurYdFJDT4+XzyPvo3sxeT=zjXqZGCPpDbUFwjqG1B3pBw@mail.gmail.com>
2017-06-16 6:24 ` Michael Eager
2017-06-16 10:16 ` Fwd: " Michael O'Cleirigh
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=59437B68.5090601@eagerm.com \
--to=eager@eagerm$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox