Re: Trying to sync two svn repositories with git-svn (repost)

On Wed, May 6, 2009 at 2:52 PM, Josef Wolf [off-list ref] wrote:

Here's what I have at this point:

            ------------------S1TRUNK
           /                 /
  --hs1--O1--c2...c2-------S1
           \              /
            `+++++++.    /
                     \  /
  --hs2--O2--c1...c1--S2
           \            \
            -------------S2TRUNK

  hs1, hs2:         history imported from svn-1 and svn2, respectively
  O1, O2:           the svn-1-orig and svn-2-orig tags
  c1, c2:           cherries picked from hs1 and hs2, respectively
  S1, S2:           svn-1 and svn-2, the local tracking branches
  S1TRUNK, S2TRUNK: the remotes/svn-X/trunk branches

I would have expected a symmetrical diagram.  But it turns out that the
connection marked with plusses is still at O1 instead of S1.  So it takes
no wonder that the c2 cherries get re-applied to the s2 branch on the
next merge.

That's a well-drawn diagram, but unfortunately I'm still confused.
What is the "connection marked with plusses" and does it have a name?
It *looks* to me like both S1TRUNK and S2TRUNK should be okay, but
it's hard to tell what has actually happened here.

If you could post a screenshot of 'gitk --all' it might help.

Avery