From: Josef Wolf <jw@raven.inka.de>
To: git@vger.kernel.org
Subject: Re: Trying to sync two svn repositories with git-svn (repost)
Date: Wed, 6 May 2009 20:52:24 +0200 [thread overview]
Message-ID: <20090506185224.GM15420@raven.wolf.lan> (raw)
In-Reply-To: <20090504211423.GK15420@raven.wolf.lan>
On Mon, May 04, 2009 at 11:14:23PM +0200, Josef Wolf wrote:
I am still trying to understand what is going on here, so I tried to
draw the history-graph. It turns out that after the "getting-started"
commands is not what I would have expected:
> git tag svn-1-orig svn-1
> git tag svn-2-orig svn-2
>
> # move cherries to svn-2
> #
> git svn fetch svn-1
> git checkout svn-2
> git cherry-pick c9da
> [ ... ]
> git merge --no-ff -s ours svn-1
> git checkout svn-2/trunk
> git merge --no-ff svn-2
> git svn dcommit
>
> # move cherries to svn-1
> #
> git svn fetch svn-2
> git checkout svn-1
> git cherry-pick 05b9
> [ ... ]
> git merge --no-ff -s ours svn-2
> git checkout svn-1/trunk
> git merge --no-ff svn-1
> git svn dcommit
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.
Is this understanding somewhat plausible? Any ideas how to get this
this fixed?
next prev parent reply other threads:[~2009-05-06 18:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-27 20:12 Trying to sync two svn repositories with git-svn (repost) Josef Wolf
2009-04-28 20:30 ` Josef Wolf
2009-04-28 20:53 ` Avery Pennarun
2009-04-28 22:37 ` Josef Wolf
2009-04-29 3:19 ` Avery Pennarun
2009-04-29 16:01 ` Josef Wolf
2009-04-29 18:13 ` Avery Pennarun
2009-04-29 22:37 ` Josef Wolf
2009-04-30 2:07 ` Avery Pennarun
2009-04-30 22:28 ` Josef Wolf
2009-04-30 22:59 ` Avery Pennarun
2009-05-01 14:28 ` Josef Wolf
2009-05-01 19:17 ` Avery Pennarun
2009-05-02 21:58 ` Josef Wolf
2009-05-04 15:58 ` Avery Pennarun
2009-05-04 21:14 ` Josef Wolf
2009-05-06 18:52 ` Josef Wolf [this message]
2009-05-06 19:23 ` Avery Pennarun
2009-05-06 22:50 ` Josef Wolf
2009-05-08 20:44 ` Avery Pennarun
2009-05-08 23:58 ` Josef Wolf
2009-05-13 12:09 ` Josef Wolf
2009-05-13 17:28 ` Avery Pennarun
2009-05-13 22:22 ` Josef Wolf
2009-05-14 6:35 ` Avery Pennarun
2009-05-14 21:41 ` Josef Wolf
2009-05-14 21:57 ` Avery Pennarun
2009-05-15 17:52 ` Josef Wolf
2009-05-15 19:05 ` Avery Pennarun
2009-05-17 11:24 ` Josef Wolf
2009-05-20 16:40 ` Josef Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090506185224.GM15420@raven.wolf.lan \
--to=jw@raven.inka.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).