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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html