On 27/02/2018 19:55, Igor Djordjevic wrote:
>
> It would be more along the lines of "(1) rebase old merge commit parents,
> (2) generate separate diff between old merge commit and each of its
> parents, (3) apply each diff to their corresponding newly rebased
> parent respectively (as a temporary commit, one per rebased parent),
> (4) merge these temporary commits to generate 'rebased' merge commit,
> (5) drop temporary commits, recording their parents as parents of
> 'rebased' merge commit (instead of dropped temporary commits)".
>
> Implementation wise, steps (2) and (3) could also be done by simply
> copying old merge commit _snapshot_ on top of each of its parents as
> a temporary, non-merge commit, then rebasing (cherry-picking) these
> temporary commits on top of their rebased parent commits to produce
> rebased temporary commits (to be merged for generating 'rebased'
> merge commit in step (4)).
For those still tagging along (and still confused), here are some
diagrams (following what Sergey originally described). Note that
actual implementation might be even simpler, but I believe it`s a bit
easier to understand like this, using some "temporary" commits approach.
Here`s our starting position:
(0) ---X1---o---o---o---o---o---X2 (master)
|\
| A1---A2---A3
| \
| M (topic)
| /
\-B1---B2---B3
Now, we want to rebase merge commit M from X1 onto X2. First, rebase
merge commit parents as usual:
(1) ---X1---o---o---o---o---o---X2
|\ |\
| A1---A2---A3 | A1'--A2'--A3'
| \ |
| M |
| / |
\-B1---B2---B3 \-B1'--B2'--B3'
That was commonly understandable part. Now, for "rebasing" the merge
commit (keeping possible amendments), we do some extra work. First,
we make two temporary commits on top of old merge parents, by using
exact tree (snapshot) of commit M:
(2) ---X1---o---o---o---o---o---X2
|\ |\
| A1---A2---A3---U1 | A1'--A2'--A3'
| \ |
| M |
| / |
\-B1---B2---B3---U2 \-B1'--B2'--B3'
So here, in terms of _snapshots_ (trees, not diffs), U1 = U2 = M.
Now, we rebase these temporary commits, too:
(3) ---X1---o---o---o---o---o---X2
|\ |\
| A1---A2---A3---U1 | A1'--A2'--A3'--U1'
| \ |
| M |
| / |
\-B1---B2---B3---U2 \-B1'--B2'--B3'--U2'
As a next step, we merge these temporary commits to produce our
"rebased" merged commit M:
(4) ---X1---o---o---o---o---o---X2
|\ |\
| A1---A2---A3---U1 | A1'--A2'--A3'--U1'
| \ | \
| M | M'
| / | /
\-B1---B2---B3---U2 \-B1'--B2'--B3'--U2'
Finally, we drop temporary commits, and record rebased commits A3'
and B3' as our "rebased" merge commit parents instead (merge commit
M' keeps its same tree/snapshot state, just gets parents replaced):
(5) ---X1---o---o---o---o---o---X2
|\ |\
| A1---A2---A3---U1 | A1'--A2'--A3'
| \ | \
| M | M'
| / | /
\-B1---B2---B3---U2 \-B1'--B2'--B3'
And that`s it, our merge commit M has been "rebased" to M' :)
(6) ---X1---o---o---o---o---o---X2 (master)
|\
| A1'--A2'--A3'
| \
| M' (topic)
| /
\-B1'--B2'--B3'
Important thing to note here is that in our step (3) above, still in
terms of trees/snapshots (not diffs), U1' could still be equal to
U2', produced merge commit M' tree thus being equal to both of them
as well (merge commit introducing no changes to either of its
parents, originally described by Sergey as "angel merge").
But it doesn`t have to be so - if any of the rebased commits A1 to A3
or B1 to B3 was dropped or modified (or extra commits added, even),
that would influence the trees (snapshots) produced after rebasing U1
and U2 to U1' and U2', final merge M' reflecting all these changes as
well, besides keeping original merge commit M amendments (preserving
"evil merge").
Well, that`s some theory, now to hopefully confirm/test/polish all
this... or trash it, if flawed beyond correction :P
Regards, Buga
