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

sharing git work while downstream from svn?

From
tom fogal <tfogal@alumni.unh.edu>
Date
Aug 11, 2009, 22:55 UTC
Message-ID
<auto-000020209577@sci.utah.edu>

How do others manage distributed version control when everyone is forced to rebase all the time?

To give a concrete example: in one project where I have this issue, there's a developer who is effectively 'downstream' from me. There's a few other developers who are peers, w/ commit bits set on the centralized server. I'll make some patches that should end up on our centralized trunk, and some that our for our experimental sub-project, so I use format-patch and send patches around for those.

This gets to be a mess when trunk changes: I'll rebase + potentially fix some conflicts. Other developers with some of the experimental patches will svn update, and get similar conflicts. These might differ in subtle ways, and now exchanging patches gets more difficult.

I'm not sure getting them to use git would even help. Once I rebase, I screw my downstream. Yet I can't avoid rebasing since I need to update.

As I recall, some members of the gcc community are handling this problem, somehow. How do you do it? Or do you just not collaborate at the git level?

Thanks,
-tom
Next: Avery Pennarun
Message 1 of 4 in “sharing git work while downstream from svn?”
  1. tom fogalAug 11, 2009
  2. Avery PennarunAug 11, 2009
  3. tom fogalAug 11, 2009
  4. Avery PennarunAug 11, 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.