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

git-svn: after fetch , move 'remotes/git-svn' commits to be under 'master' ?

From
MNMichael Norman <mwnorman@gmail.com>
Date
Dec 1, 2009, 16:18 UTC
Message-ID
<d43c95440912010818j3c0b98e0o504f82c666c7a290@mail.gmail.com>
I don't know if following work-flow makes sense, but here it is:

step 0) clone a (very!) large SVN repository: since --depth=1 doesn't work for git-svn clone, pick the revision manually. In this case, I picked the revision one behind HEAD, so I have only 2 commits in my working copy:

yellow-dot - master
    |
blue-dot    - misc. tweak settings
    |
blue-dot    - bug 295xx - fix
step 1) I then created a few local branches off of master - br1, br2, etc.
           Some local commits are created under each branch
Pick up latest_&_greatest revisions from SVN
step 2) git svn fetch (about ~50 commits)
           These all identify their branch as 'remotes/git-svn'

It is possible to move the fetched commits to be under 'master'? My local branch commits do not overlap (adding new functionality only), so if the new commits are moved to be under master, then branches br1 and br2 will inherit those changes - correct?

Any advice would be greatly appreciated - say if for example my work flow is all wrong and there is a better way to keep in sync with the remote SVN repository while still commiting local work in my working-copy tree

Mike Norman
Message 1 of 1 in “git-svn: after fetch , move 'remotes/git-svn' commits to be under 'master' ?”
  1. Michael NormanDec 1, 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.