On 9/15/15, Eric Rubin-Smith <[email protected]> wrote: > >> The merge algorithm does *not* consider cherry-picks. It looks for >> the most recent common ancestor without taking cherry-picks into >> account. > > Another popular version control tool whose name I won't mention (hint: > rhymes with "zit") behaves identically to fossil in this scenario. Is there > some deeper reason for not using the cherry pick "arrow", or is it simply > that yall haven't had a need to improve the behavior here yet so haven't > bothered? >
Merge is done by a classic 3-way diff. It looks at all the changes that occurred on the path from A to B and applies those same changes to C. (A in this case would be the most recent common ancestor of B and C). How would cherry-picks factor into this? -- D. Richard Hipp [email protected] _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
