Hi Phillip, On 02/03/2018 12:31, Phillip Wood wrote: > > > Thinking about it overnight, I now suspect that original proposal had a > > mistake in the final merge step. I think that what you did is a way to > > fix it, and I want to try to figure what exactly was wrong in the > > original proposal and to find simpler way of doing it right. > > > > The likely solution is to use original UM as a merge-base for final > > 3-way merge of U1' and U2', but I'm not sure yet. Sounds pretty natural > > though, as that's exactly UM from which both U1' and U2' have diverged > > due to rebasing and other history editing. > > Hi Sergey, I've been following this discussion from the sidelines, > though I haven't had time to study all the posts in this thread in > detail. I wonder if it would be helpful to think of rebasing a merge as > merging the changes in the parents due to the rebase back into the > original merge. So for a merge M with parents A B C that are rebased to > A' B' C' the rebased merge M' would be constructed by (ignoring shell > quoting issues) > > git checkout --detach M > git merge-recursive A -- M A' > tree=$(git write-tree) > git merge-recursive B -- $tree B' > tree=$(git write-tree) > git merge-recursive C -- $tree C' > tree=$(git write-tree) > M'=$(git log --pretty=%B -1 M | git commit-tree -pA' -pB' -pC') > > This should pull in all the changes from the parents while preserving > any evil conflict resolution in the original merge. It superficially > reminds me of incremental merging [1] but it's so long since I looked at > that I'm not sure if there are any significant similarities. > > [1] https://github.com/mhagger/git-imerge Interesting, from quick test[3], this seems to produce the same result as that other test I previously provided[2], where temporary commits U1' and U2' are finally merged with original M as a base :) Just that this looks like even more straight-forward approach...? The only thing I wonder of here is how would we check if the "rebased" merge M' was "clean", or should we stop for user amendment? With that other approach Sergey described, we have U1'==U2' to test with. By the way, is there documentation for `git merge-recursive` anywhere, besides the code itself...? :$ Thanks, Buga [2] https://public-inbox.org/git/f1a960dc-cc5c-e7b0-10b6-39e5516655b3@xxxxxxxxx/ [3] Quick test script: -- >8 -- #!/bin/sh # rm -rf ./.git # rm -f ./test.txt git init touch ./test.txt git add -- test.txt # prepare repository for i in {1..8} do echo X$i >>test.txt git commit -am "X$i" done # prepare branch A git checkout -b A sed -i '2iA1' test.txt git commit -am "A1" sed -i '4iA2' test.txt git commit -am "A2" sed -i '6iA3' test.txt git commit -am "A3" # prepare branch B git checkout -b B master sed -i '5iB1' test.txt git commit -am "B1" sed -i '7iB2' test.txt git commit -am "B2" sed -i '9iB3' test.txt git commit -am "B3" git checkout -b topic A git merge -s ours --no-commit B # merge A and B with `-s ours` sed -i '8iM' test.txt # amend merge commit ("evil merge") git commit -am "M" git tag M #original-merge # master moves on... git checkout master git cherry-pick B^ # cherry-pick B2 into master sed -i "1iX9" test.txt # add X9 git commit -am "X9" # (0) ---X8--B2'--X9 (master) # |\ # | A1---A2---A3 (A) # | \ # | M (topic) # | / # \-B1---B2---B3 (B) # simple/naive demonstration of proposed merge rebasing logic # using iterative merge-recursive, preserving merge commit manual # amendments, testing `-s ours` merge with cherry-picking from # obsoleted part, but still respecting interactively rebased # added/modified/dropped/cherry-picked commits :) git checkout -b A-prime A git reset --hard HEAD^ # drop A3 from A sed -i '/A1/c\A12' test.txt # amend A1 to A12 git commit -a --amend --no-edit git rebase master # rebase A onto master git cherry-pick B # cherry-pick B3 into A git checkout -b B-prime B git rebase master # rebase B onto master sed -i '12iB4' test.txt # add B4 git commit -am "B4" git checkout --detach M git merge-recursive A -- M A-prime tree="$(git write-tree)" git merge-recursive B -- $tree B-prime tree="$(git write-tree)" git tag M-prime "$(git log --pretty=%B -1 M | git commit-tree $tree -p A-prime -p B-prime)" git update-ref refs/heads/topic "$(git rev-parse M-prime)" git checkout topic # (1) ---X8--B2'--X9 (master) # |\ # | A12--A2'---B3' (A) # | \ # | M' (topic) # | / # \-B1'--B3'---B4 (B) # show resulting graph # echo # git log --all --decorate --oneline --graph # in comparison to original merge commit M, rebased merge commit # M' is expected to: # # - Add X9, from updated "master" # - Have A1 changed to A12, due to A12 commit amendment # - Keep A2, rebased as A2' # - Remove A3, due to dropped A3 commit # - Keep amendment from original (evil) merge commit M # - Miss B1' like M does B, due to original `-s ours` merge strategy # - Add B2, cherry-picked as B2' into "master" # - Add B3, cherry-picked as B3' into "A" # - Add B4, added to "B" # # echo # echo 'diff M M-prime:' # git diff M M-prime
