After the first botched attempt, I think that I got the merge done correctly without any differences to master or the new stable this time.
If for some reason, you're interested - the code is up in the same github repo as before:
https://github.com/tflink/autoqa-devel
Instead of handling all the merge conflicts by hand, I found a vim plugin for git (fugitive) that made the process a lot easier and less vulnerable to human error:
http://www.vim.org/scripts/script.php?script_id=2975
There is even a vimcast covering git merge resolving with fugitive:
http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vim...
Anyhow, it was more of an academic exercise at this point. The history is preserved after merge if you follow a specific file (git log --all --follow autoqa.spec for example). I captured that data for the fedorahosted repo [1] and my github repo [2]. Unfortunately, the graphs look horrible in either vim or firefox due to the way they're formatted but they look fine if you cat the files.
I took screenshots of the git log graph for both the fedorahosted repo [1] and my github repo [2] (note that for the github graph, origin is github and upstream is fedorahosted). They do look different but I think that I created them the same way (QGit, same top and bottom).
Tim
[1] http://tflink.fedorapeople.org/autoqa/git_merge/fedorahosted_followspec [2] http://tflink.fedorapeople.org/autoqa/git_merge/github_followspec [3] http://tflink.fedorapeople.org/autoqa/git_merge/fedorahosted_graph.png [4] http://tflink.fedorapeople.org/autoqa/git_merge/github_graph.png
autoqa-devel@lists.fedorahosted.org
-
Tim Flink