git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Avery Pennarun <apenwarr@gmail.com>
Date
May 1, 2009, 19:17 UTC
Message-ID
<32541b130905011217x7f339d41x696fedee7298e3a4@mail.gmail.com>
In-Reply-To
<20090501142811.GI15420@raven.wolf.lan>
On Fri, May 1, 2009 at 10:28 AM, Josef Wolf <jw@raven.inka.de> wrote:
Show 6 quoted lines
> On Thu, Apr 30, 2009 at 06:59:50PM -0400, Avery Pennarun wrote:
>> "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.

Show 8 quoted lines
>> 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.

>> 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
Previous: Josef WolfNext: Josef Wolf
Message 13 of 31 in “Trying to sync two svn repositories with git-svn (repost)”
  1. Josef WolfApr 27, 2009
  2. Josef WolfApr 28, 2009
  3. Avery PennarunApr 28, 2009
  4. Josef WolfApr 28, 2009
  5. Avery PennarunApr 29, 2009
  6. Josef WolfApr 29, 2009
  7. Avery PennarunApr 29, 2009
  8. Josef WolfApr 29, 2009
  9. Avery PennarunApr 30, 2009
  10. Josef WolfApr 30, 2009
  11. Avery PennarunApr 30, 2009
  12. Josef WolfMay 1, 2009
  13. Avery PennarunMay 1, 2009
  14. Josef WolfMay 2, 2009
  15. Avery PennarunMay 4, 2009
  16. Josef WolfMay 4, 2009
  17. Josef WolfMay 6, 2009
  18. Avery PennarunMay 6, 2009
  19. Josef WolfMay 6, 2009
  20. Avery PennarunMay 8, 2009
  21. Josef WolfMay 8, 2009
  22. Josef WolfMay 13, 2009
  23. Avery PennarunMay 13, 2009
  24. Josef WolfMay 13, 2009
  25. Avery PennarunMay 14, 2009
  26. Josef WolfMay 14, 2009
  27. Avery PennarunMay 14, 2009
  28. Josef WolfMay 15, 2009
  29. Avery PennarunMay 15, 2009
  30. Josef WolfMay 17, 2009
  31. Josef WolfMay 20, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.