{"thread":{"id":"49888","subject":"How to add edges to visualize cherry-picks and ported patches","startedAt":"2018-11-24T15:45:23Z","lastAt":"2018-11-24T15:45:23Z","messageCount":1,"participants":["Hartmut Goebel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"364009","messageId":"9469d243-46c6-bf94-2586-84c59b866733@crazy-compilers.com","threadId":"49888","inReplyTo":null,"subject":"How to add edges to visualize cherry-picks and ported patches","fromName":"Hartmut Goebel","fromEmail":"h.goebel@crazy-compilers.com","sentAt":"2018-11-24T15:45:18Z","receivedAt":"2018-11-24T15:45:23Z","isPatch":false,"sender":{"key":"h.goebel@crazy-compilers.com","avatar":null},"body":"Hi,\n\nI hope this is the right place for this answer. If not, plaese point me\nto a more appropriate place.\n\nA project  \"P2\" [2] forked from another project \"P1\" [1]  quite some\ntime ago, both repos share a common history up to some point. After this\npoint, P2 cherry-picked commits from P1, but did not merge P1 any\nlonger. Unfortunately the author of P2 did not use any mechanism (e.g.\nan intermediate branch) to allow tracking up to which point P1 commits\nare considered. Thus the graph looks like this:\n\nP1: --A--B--C--X--X--D--E--X--X--X--F--\n\nP2: --Y--Y--A--B--C--D--E--Y--F--\n\nI would like to add edges (say: another branch and merge-commits) to the\ngraph to make it look something like this:\n\nP1:      --A--B--C--X--X--D--E--X--X--X--F--\n                  \\           \\           \\\n                   o-----------o-----------o---new branch\n                  /           /           /\nP2: --Y--Y--A--B--C-------D--E----Y------F--\n\nOf course the new branch should contain the same code as the respective\nP2-commit. So at the end, the new branch couls become the P2's new\n\"master\" branch.\n\nHow can I achieve this (which commands to use)?\n\nIs there some way to automate this? (e.g. based on `git cherry`)\n\nThanks in advance for any answer\n\n[1] https://github.com/siacs/Conversations\n[2] https://github.com/kriztan/Pix-Art-Messenger\n\n-- \nRegards\nHartmut Goebel\n\n| Hartmut Goebel          | h.goebel@crazy-compilers.com               |\n| www.crazy-compilers.com | compilers which you thought are impossible |\n\n"}]}