Git svn workflow, creating branches in git-svn

Question

git version 1.7.3.3

I had a project that used git.

Our company has changed its policy and wanted everyone to switch to svn.

So, I imported my project into subversion using the standard layout (trunk, branches and tags).

So my current workflow is as follows:

Make some changes, put them in the staging area, then copy them to git. However, I'm a little confused when it comes to svn. First I reinstall to get the latest changes from subversion. Then I do dcommit.

i.e.

Create change files

git stage app_driver.c

Commit them to git

git commit -m"Added some changes"

Get recent changes from svn

git svn rebase

commit my latest changes to svn

git svn dcommit

push changes in my git repository

git push upstream my_project

, git subversion.

git checkout -b add_new_feature

svn ?

,

Answer 1

subversion, svn copy.

, , https://svnserver/svn/MyProject/trunk, https://svnserver/svn/MyProject/branches/my-branch, :

svn copy https://svnserver/svn/MyProject/trunk https://svnserver/svn/MyProject/branches/my-branch

, svn, git, git svn fetch. svn, .

git svn init --stdlayout, , git -r. :

git checkout -b my_local_branch_name my_remote_branch_name

. , git ( ).

.

Answer 2

subversion, , , /trunk.

, /trunk, , :

git checkout -b add_quick_change

.

, /trunk:

git checkout master
git pull --no-squash . add_quick_change
git svn dcommit

master, dcommit.