Dealing with rewritten upstream

Dealing with rewritten upstream

[Jay Soffian]

I have a repo w/over two years of history whose upstream repo is a
git-svn mirror.

The upstream folks recently announced they need to retire the existing
repo and replace it with a new repo. The new repo is identical to the
old repo tree wise (commit for commit), but some of the commits in the
old repo had incorrect authorship which is corrected in the new repo,
so the new repo has different commit IDs than the old.

(i.e., it's as if they've run filter-branch --env-filter on the old repo.)

My repo has many merge points with the old history.

Pictorially:

---A---B---C---D---E... new-upstream/master

---a---b---c---d---e... old-upstream/master
    \       \       \
     1---2---3---4---5  master

The obvious way do deal with this situation is:

$ git merge -s ours -m "Splice in new-upstream/master" E

Are there any other/better options I'm missing?

(Eventually upstream plans to migrate entirely to git, so I can't just
run git-svn myself.)

j.

Re: Dealing with rewritten upstream

[Michael Witten]

On Fri, Sep 30, 2011 at 22:09, Jay Soffian <jaysoffian@gmail.com> wrote:
> I have a repo w/over two years of history whose upstream repo is a
> git-svn mirror.
>
> The upstream folks recently announced they need to retire the existing
> repo and replace it with a new repo. The new repo is identical to the
> old repo tree wise (commit for commit), but some of the commits in the
> old repo had incorrect authorship which is corrected in the new repo,
> so the new repo has different commit IDs than the old.
>
> (i.e., it's as if they've run filter-branch --env-filter on the old repo.)
>
> My repo has many merge points with the old history.
>
> Pictorially:
>
> ---A---B---C---D---E... new-upstream/master
>
> ---a---b---c---d---e... old-upstream/master
>    \       \       \
>     1---2---3---4---5  master
>
> The obvious way do deal with this situation is:
>
> $ git merge -s ours -m "Splice in new-upstream/master" E
>
> Are there any other/better options I'm missing?
>
> (Eventually upstream plans to migrate entirely to git, so I can't just
> run git-svn myself.)

Surely, you'd rather have your master rewritten such that the relevant
commits of new-upstream/master are used IN PLACE of the corresponding
old-upstream/master. Have you considered ways to achieve that?

Re: Dealing with rewritten upstream

[Jay Soffian]

On Fri, Sep 30, 2011 at 7:04 PM, Michael Witten <mfwitten@gmail.com> wrote:
>> Pictorially:
>>
>> ---A---B---C---D---E... new-upstream/master
>>
>> ---a---b---c---d---e... old-upstream/master
>>    \       \       \
>>     1---2---3---4---5  master
>>
>> The obvious way do deal with this situation is:
>>
>> $ git merge -s ours -m "Splice in new-upstream/master" E
>>
>> Are there any other/better options I'm missing?
>>
>> (Eventually upstream plans to migrate entirely to git, so I can't just
>> run git-svn myself.)
>
> Surely, you'd rather have your master rewritten such that the relevant
> commits of new-upstream/master are used IN PLACE of the corresponding
> old-upstream/master. Have you considered ways to achieve that?

My master has over two years of history with its commit-IDs referenced
in our bug tracker, in old emails, in archived binaries, etc. So no, I
do not want to rewrite my master.

Now, if you mean, do I want to use something like replacement refs to
try to more cleanly splice the new upstream into my existing master,
no I haven't really explored that. git-replace isn't very well
documented with examples of its intended use case.

I've considered setting up a new repo at a different URL that is
rewritten to be based on the new upstream, and migrating to that,
making the old repo read-only.

But I'm not sure that's worth the trouble. There doesn't seem to be
too much downside to splicing in the new upstream via merge -s ours.
It barely increases the repo size since the trees are the same. Maybe
there's some other downsides I'm missing.

j.

Re: Dealing with rewritten upstream

[Philip Oakley]

From: "Jay Soffian" <jaysoffian@gmail.com>
> On Fri, Sep 30, 2011 at 7:04 PM, Michael Witten <mfwitten@gmail.com> 
> wrote:
>>> Pictorially:
>>>
>>> ---A---B---C---D---E... new-upstream/master
>>>
>>> ---a---b---c---d---e... old-upstream/master
>>> \ \ \
>>> 1---2---3---4---5 master
>>>
>>> The obvious way do deal with this situation is:
>>>
>>> $ git merge -s ours -m "Splice in new-upstream/master" E
>>>
>>> Are there any other/better options I'm missing?
>>>
>>> (Eventually upstream plans to migrate entirely to git, so I can't just
>>> run git-svn myself.)
>>
>> Surely, you'd rather have your master rewritten such that the relevant
>> commits of new-upstream/master are used IN PLACE of the corresponding
>> old-upstream/master. Have you considered ways to achieve that?
>
> My master has over two years of history with its commit-IDs referenced
> in our bug tracker, in old emails, in archived binaries, etc. So no, I
> do not want to rewrite my master.
>
> Now, if you mean, do I want to use something like replacement refs to
> try to more cleanly splice the new upstream into my existing master,
> no I haven't really explored that. git-replace isn't very well
> documented with examples of its intended use case.
>
> I've considered setting up a new repo at a different URL that is
> rewritten to be based on the new upstream, and migrating to that,
> making the old repo read-only.
>
> But I'm not sure that's worth the trouble. There doesn't seem to be
> too much downside to splicing in the new upstream via merge -s ours.
> It barely increases the repo size since the trees are the same. Maybe
> there's some other downsides I'm missing.
>
Surely; one method is to simply create a merge between the Old_master and 
New_master (i.e. have two parallel branches of identical content) at the 
point where the new approach starts. Git-filter-branch (if used) already 
provides the ref to the original, so it's easy to create that special merge.

You have already noted that all the trees for the commits are identical, so 
the storage overhead is minimal for just the new commit objects (though the 
cognitive overhead can be large for some - plan for often/early 
explanations!)

I'm presuming that you will have at some point in the past, a common commit 
(it maybe the initial commit), so that there is still a single root.

The key question is to decide which 'branch' is Parent1, and which is 
Parent2 (at the merge) for any history traversals that may be required in 
the future. After the merge you can rename the branch back to Master if 
required (more cognitive discussions..)

This slightly differs from your original diagram in that you do not have any 
one-to-one links between the old and new commits. The date/time would be the 
same for the old & new so it shouldn't be hard to find one from the other.

Philip