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: Tue, 28 Apr 2009 22:30:40 +0200 [thread overview]
Message-ID: <20090428203040.GD15420@raven.wolf.lan> (raw)
In-Reply-To: <20090427201251.GC15420@raven.wolf.lan>
On Mon, Apr 27, 2009 at 10:12:51PM +0200, Josef Wolf wrote:
[ ... ]
> give me the desired outputs. Now I do
>
> git checkout svn-first
> git merge -s ours svn-second
> git checkout svn-second
> git merge -s ours svn-first
>
> to tell git that the branches are in sync.
>
> But now, when I try to
>
> git checkout svn-second
> git svn rebase
>
> I get lots of conflicts. When I inspect the .git/rebase-apply directory
> and the conflicts, it looks like "git svn rebase" tries to re-apply all
> the commits from svn-first. When I omit the "git merge -s ours svn-first"
> command, it does not re-apply those commits. So it looks like the
> "git merge -s ours" wipes some information that git-svn needs to know
> what was already merged.
>
> What am I missing? I thought the "ours" strategy is meant to tell git
> that everything from that branch was merged, either manually or by
> cherry-pick.
After lots of RTFM, I get the impression, that cherry-pick is the only
operation I can do to sync a git-svn branch with other (git or git-svn)
branches. merge/pull should be avoided.
But then, how do I mark cherry-picked commits as "already synched"?
next prev parent reply other threads:[~2009-04-28 20:40 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 [this message]
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
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=20090428203040.GD15420@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).