Re: [Gnu-arch-users] Star-merge Fatally Wounded

[Aaron Bentley]

To put it another way, star-merge works when one revision from REFERENCE 
or OTHER is the most recent merge.  When merges happen in parallel, 
there is no most recent merge, and the algorithm breaks.

The star-merge command should be updated to detect this situation and 
error-out when it occurs.  This can be done by determining 
LAST_MERGE_INTO_REFERENCE, comparing it with MAYBE_ANCESTOR_2, and 
determining ANCESTOR'.  If ANCESTOR' is not ANCESTOR, then there is no 
valid ANCESTOR.

Aaron

--
Aaron Bentley
Director of Technology
Panometrics, Inc.