Merge-base algorithm?
- From
- Josh ben Jore <jbenjore@whitepages.com>
- Date
- Jul 30, 2009, 04:16 UTC
- Message-ID
- <D5F958F92101F74D8A5683C2FE14F4200F231037@post.corp.w3data.com>
What is the merge-base algorithm for selecting nodes? How can I subsume nodes in the selected list?
I want to change the result of my current merge-base command. Right now it includes nodes "A", "B", and "C" and I am experiencing a segmentation fault when merging "A" and "B." I want to add a commit to the tree which subsumes nodes "A" and "B" so that my merge-base is against "new node(A+B)" and "C" or something similar.
I am attempting to work around the bug described in the thread "Null deref in recursive merge in df73af5f667a479764d2b2195cb0cb60b0b89e3d."
Regards, Josh