Add three new goals that involve keeping the border commits #133
Conversation
Add three new goals: * `border` * `border-with-history` * `border-with-history2` These keep all the commits along both edges of the border of the full merge graph, but not interior merge commits. They differ in whether to also preserve history information across the "gap", like `rebase` vs. `rebase-with-history`. See the README for more information.
There was a problem hiding this comment.
Thanks for adding this functionality! My understanding is that this only reduces the number of commits for the simplify result and won't change the way how merge works. Specifically auto_expand_frontier() will always do bisection for the new goals which will potentially cause problem?
|
By default, these goals use bisection. Why do you think that is a problem? It should save a lot of time if you have a bunch of commits on each branch. But if you insist on a full imerge, I think it should be possible to do the merge using If that doesn't answer your question, then you need to sketch a diagram so I know exactly what you're asking. |
|
Never mind - I guess I didn't understand how merge works when goal is not equal to full. I'll try this change out. |
Add three new goals:
borderborder-with-historyborder-with-history2These keep all the commits along both edges of the border of the full merge graph, but not interior merge commits. They differ in whether to also preserve history information across the "gap", like
rebasevs.rebase-with-history. See the README for more information.See #129 for some discussion of why these might be useful.
/cc @make1980