{"thread":{"id":"21808","subject":"git-svn: after fetch , move 'remotes/git-svn' commits to be under 'master' ?","startedAt":"2009-12-01T16:18:05Z","lastAt":"2009-12-01T16:18:05Z","messageCount":1,"participants":["Michael Norman"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"128890","messageId":"d43c95440912010818j3c0b98e0o504f82c666c7a290@mail.gmail.com","threadId":"21808","inReplyTo":null,"subject":"git-svn: after fetch , move 'remotes/git-svn' commits to be under 'master' ?","fromName":"Michael Norman","fromEmail":"mwnorman@gmail.com","sentAt":"2009-12-01T16:18:05Z","receivedAt":"2009-12-01T16:18:05Z","isPatch":false,"sender":{"key":"mwnorman@gmail.com","avatar":null},"body":"I don't know if following work-flow makes sense, but here it is:\n\nstep 0) clone a (very!) large SVN repository: since --depth=1 doesn't\nwork for git-svn clone,\npick the revision manually. In this case, I picked the revision one\nbehind HEAD, so I have\nonly 2 commits in my working copy:\n\nyellow-dot - master\n    |\nblue-dot    - misc. tweak settings\n    |\nblue-dot    - bug 295xx - fix\n\nstep 1) I then created a few local branches off of master - br1, br2, etc.\n           Some local commits are created under each branch\n\nPick up latest_&_greatest revisions from SVN\nstep 2) git svn fetch (about ~50 commits)\n           These all identify their branch as 'remotes/git-svn'\n\nIt is possible to move the fetched commits to be under 'master'? My\nlocal branch commits\ndo not overlap (adding new functionality only), so if the new commits\nare moved to be under\nmaster, then branches br1 and br2 will inherit those changes - correct?\n\nAny advice would be greatly appreciated -  say if for example my work\nflow is all wrong and\nthere is a better way to keep in sync with the remote SVN repository\nwhile still commiting local\nwork in my working-copy tree\n\nMike Norman\n"}]}