Re: [Gnu-arch-users] Star merging with 3 branches

[Tom Lord]

    > From: Aaron Bentley <address@hidden>

    > But this all means that star-merge is using a totally different
    > algorithm from the one I do by hand:

    > 1. Read merge history file for target ($ less lastmerge)
    > 2. Determine which of the requested changes have been committed to
    > source but not to target. ($ less ../release/lasttag)
    > 3. Apply the selected changes to target. ($cvs update -j foo -j bar)
    > 4. Update merge history for target

    > I'm not sure whether this algorithm is scalable, but it does seem to be
    > automatable.  It's rather tricky to do by hand too, so I'd hoped Arch
    > would be able to do it automatically for me.

Your by-hand algorithm is a little vague to me but I'm pretty sure
that arch can do what you're thinking of.

The issue is step (2) -- "determine which of the requested changes
have been committed to source but not target".   That concept is a
little ambiguous.   The --reference option to star-merge is one way to
disambiguate it and sticking to star topology patch flows is a way to
simply evade having to ask the question.


-t