[Gnu-arch-users] star-merge after independent branch (of version number)

[Rob Browning]

Imagine that you have two users (A and B), one working on branch
A/foo--bar--1 and one working on branch B/foo-bar--1.  The latter
branch was tagged from the former, and the two users have been
star-merging back and forth for a while.

Now imagine that it's time to start working on the new version,
foo--bar--2, but for whatever reason, both users independently created
their own foo--bar-2 by tagging from their own foo--bar--1.

Given that, is it possible to arrange for these users to continue
star-merging between their two, new foo--bar--2 branches?  (By default
star-merge thinks they're unrelated[1].)

Graphically the arrangement should look like this:

  A/foo--bar--1  --tag-->  B/foo--bar--1
          |                        |
         tag                      tag
          |                        |
           > A/foo--bar--2          > B/foo--bar--2


[1] I know there are ways to alter that (--reference, join-tree,
    etc.), but I didn't know if those actions would be appropriate
    here.

Finally, if the above situation is just considered one you should
avoid, then what's the recommended alternate practice -- avoid that
kind of parallel, independent branching, avoid star-merge?

(I had thought that you usually wanted to try star-merge first, but the
 limitations mentioned in the wiki sound fairly substantial (no
 cherrypicking, can't handle "same time merges", etc.).)

Thanks

-- 
Rob Browning
rlb @defaultvalue.org and @debian.org; previously @cs.utexas.edu
GPG starting 2002-11-03 = 14DD 432F AE39 534D B592  F9A0 25C8 D377 8C7E 73A4