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

On Fri, May 1, 2009 at 10:28 AM, Josef Wolf [off-list ref] wrote:

On Thu, Apr 30, 2009 at 06:59:50PM -0400, Avery Pennarun wrote:

quoted

"git log -1 first-svn" would give you the first cherry-pick.  But
remember, it's a completely different branch.

I can see why this happens, but I still find it confusing.  Maybe I
should help with the -m option?

I don't know what -m does.  Maybe try looking at the graph with gitk;
that might give some clues.

quoted

AFAIK, it will attempt to do "git svn rebase" first, and if that
succeeds, it will do the commit.

In such a case, the rebase should be okay, because it's only changing
commits (in fact, just one commit: the merge commit) that don't exist
on any other branch.  Thus it won't mangle any other merges.

Yeah, that's the simple case.  But what if the rebase don't succeed?

Then you'll get a conflict, and you'll have to fix it first before you
can dcommit.

quoted

Okay, if you want to end up with two different remote branches, it
makes sense to have two different local branches.

Well, I _have_ two different remotes because I have two svn repositories.

Right.  I was just wondering whether you wanted the two branches'
contents to be *different* or identical.  I guess different.

Then I have to keep both local branches.  But I still wonder why you
suggested to go with _one_ local branch.

For my own purposes, I try not to create a 1:1 mapping between local
branches and remote branches; this just ends up being confusing,
because I can have commits in my local branch that aren't in the
remote one, and vice versa.  So it's not very useful to create a local
branch *just* because I have a corresponding remote branch.

In your case, you might want to have just a single local branch for
your "public" stuff.  You would then merge changes from the two svn
remote branches into your local branch, and you'd also merge from your
local branch into your remote branches (using a disconnected HEAD and
svn dcommit).

Have fun,

Avery