Abandoning SVN<\/em> in our projects (gluegen, jogl and jogl-demos) for the various reasons, http:\/\/git.or.cz\/gitwiki\/GitSvnComparsion<\/a>, Here are some reasons why git<\/em> wins over mercurial\/hg,<\/p>\n especially the branch\/merge handling, maturity and wide growing user base favors git<\/em>. Some git resources:<\/p>\n The conversion demonstrated here is using the dev.java.net <\/em>gluegen repository as an example, we have converted the jogl <\/em>and jogl-demos<\/em> the same way.<\/p>\n We have used git<\/em> version 1.6.3.3.<\/strong><\/p>\n Instead of using git-svn<\/em> directly, we utilize the tool svn-all-fast-export<\/em>, http:\/\/repo.or.cz\/w\/svn-all-fast-export.git, Update: <\/em><\/strong>It turns out that the tool http:\/\/repo.or.cz\/w\/svn-all-fast-export.git<\/a> We assume the following layout ..<\/p>\n All subsequent action start from the root directory JOGL<\/em>.<\/p>\n Update:<\/em><\/strong> This task is optional. However it is highly recommended since it dramatically speeds up the SVN<\/em> checkout process.<\/p>\n First we create a local clone of the SVN<\/em> repository. This is already tricky, since the svn<\/em> versions are not backward compatible, Step [1..3] create the local SVN repository.<\/p>\n Steps [4..6] create the svn critical hook file and makes it writeable, while step 5 edits it as follows:<\/p>\n Step 7 links the local SVN repository\u00a0 to it’s remote master.<\/p>\n Step 8 finally pulls it down to our local copy.<\/p>\n This is done for the jogl<\/em> and jogl-demos<\/em> repositories as well.<\/p>\n Create a svn.authors<\/em> file, which maps the svn<\/em> author names to git<\/em> author names:<\/p>\n Use the above script in all of your original checked-out svn repository directories (gluegen, jogl <\/em>and jogl-demos<\/em>) to catch all author names. We move away the old SVN checkouts ..<\/p>\n Get the tool svn-all-fast-export, http:\/\/repo.or.cz\/w\/svn-all-fast-export.git<\/a>, via git clone git:\/\/repo.or.cz\/svn-all-fast-export.git<\/a>, build and install it.<\/span><\/p>\n Go our parent directory JOGL<\/em>, where svn-server-sync<\/em> resides.<\/p>\n Copy the previously created svn.authors<\/em> file to this directory git-svn<\/em>.<\/p>\n Copy the file merged-branches-tags.rules<\/em> out of the checked out svn-all-fast-export.git<\/em> We customize the svn-all-fast-export<\/em> configuration file, here for gluegen:<\/span> This task migrates the SVN<\/em> repository to git<\/em>, note that all tags of the SVN<\/em> repository are represented as branches within git<\/em>, In case somethings goes wrong, ie the task is incompete, e.g. due to a missing author-name mapping, The converted repository has referenced branches to the remote SVN<\/em> origin, Also, as mentioned above, SVN<\/em> tags are actually branches, so we have to converted them to git<\/em> tags.<\/p>\n The above shows us a few remote branches and no tags.<\/p>\n We have to distinguish the remote branches from the tags, Last but not least, we have to manually create git <\/em>tags from the fake SVN<\/em> tags, which are visible as remotes\/tags\/*<\/em> branches.<\/p>\n Step [1..2] creates local branches with the prefix tag_ from the remote ones. In case you have many branches, you may use a simple shell script, fed with a file containing the branch names, In case you have many tags, you may use a simple shell script, fed with a file containing the tag names, Since the conversion left a lot of dirt in the git<\/em> repository, and we have joggled around with a lot branches, Pre cleanup: 15MByte, post cleanup 6.6MByte, bare mirror 2.7M.<\/p>\n Now we push our conversion to the git<\/em> server’s repository:<\/p>\n The mirror option ensures a 1:1 copy including all branches and tags.<\/p>\n We assume to be in our root directory JOGL<\/em>.<\/p>\n No more gluegen<\/em>, jogl<\/em> or jogl-demos<\/em> directory exist anymore, since we moved it away to the new subdirectory svn<\/em>.<\/p>\n Step 1a<\/em> or 1b<\/em> creates the local gluegen git<\/em> clone in the directory gluegen<\/em>, Step 2 cd’s into it.<\/p>\n Step 3 lists all branches.<\/p>\n Step 4 shows remote tracked branches<\/p>\n In case you like to browse around within some branch, which is not yet local, ie remote, Then you can switch between local branches as usual ..<\/p>\n You may have created and published the new branch my_branch<\/em> derived from master<\/em>:<\/p>\n .. or you were using a remote branch ..<\/p>\n Now we like to remove the branch my_branch<\/em>, Step 1 removes the branch my_branch<\/em> in the local repository. Another user may want to clean up the local repository, ie remove a tracked remote branch:<\/p>\n
\nwe had to choose a new SCM.<\/p>\n\n
\nHowever, it may also be just a matter of taste ..<\/p>\n\n
SVN<\/em> to git<\/em> Conversion<\/h2>\n
\n<\/a>which not only uses a fast local SVN<\/em> repository, but also migrates all local branches and tags to git<\/em> branches.
\nThe latter is true, SVN<\/em> tags converted to git branches, since SVN<\/em> tags are actually branches.<\/span><\/p>\n
\nis not able to find the proper tag and branch points within the original repository,
\nhence we will use git-svn<\/em><\/a>.<\/p>\nDirectory Layout<\/h3>\n
\/..\/JOGL\r\n\/..\/JOGL\/svn-server-sync\r\n\/..\/JOGL\/svn\r\n\/..\/JOGL\/git-svn<\/pre>\n
SVN<\/em> Preperation<\/h3>\n
Clone Repository<\/h4>\n
\ni.e. dev.java.net<\/em> SVN<\/em> repository cannot be synchronized with svn<\/em> version 1.6. The latest compatible version is svn<\/em> 1.5.2.
\nHere we used an installed svn<\/em> version 1.4.4 from a MacOSX machine!<\/p>\n1: mkdir svn-server-sync\r\n2: cd svn-server-sync\r\n3: svnadmin create gluegen\r\n4: cp gluegen\/hooks\/pre-revprop-change.tmpl gluegen\/hooks\/pre-revprop-change\r\n5: vi gluegen\/hooks\/pre-revprop-change\r\n6: chmod ugo+x gluegen\/hooks\/pre-revprop-change\r\n7: svnsync --username userid --password pwd init file:\/\/`pwd`\/gluegen https:\/\/gluegen.dev.java.net\/svn\/gluegen<\/a>\r\n8: svnsync sync file:\/\/`pwd`\/gluegen<\/pre>\n
diff -Nur gluegen\/hooks\/pre-revprop-change.tmpl gluegen\/hooks\/pre-revprop-change\r\n--- gluegen\/hooks\/pre-revprop-change.tmpl\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 2009-07-08 09:18:55.000000000 -0700\r\n+++ gluegen\/hooks\/pre-revprop-change\u00a0\u00a0\u00a0 2009-07-08 09:20:06.000000000 -0700\r\n@@ -60,6 +60,8 @@\r\n PROPNAME=\"$4\"\r\n ACTION=\"$5\"\r\n\r\n+exit 0\r\n+\r\n if [ \"$ACTION\" = \"M\" -a \"$PROPNAME\" = \"svn:log\" ]; then exit 0; fi\r\n\r\n echo \"Changing revision properties other than svn:log is prohibited\" >&2<\/pre>\n
Create author mapping file<\/h4>\n
#!\/bin\/bash\r\nauthors=$(svn log -q | grep -e '^r' | awk 'BEGIN { FS = \"|\" } ; { print $2 }' | sort | uniq)\r\nfor author in ${authors}; do\r\n echo \"${author} = ${author} <${author}@dev.java.net>\" >> svn.authors ;\r\ndone<\/pre>\n
\nFix the svn.authors<\/em> file’s email addresses if appropriate.
\nAdd the mandatory author names:<\/p>\n(no author) = First Last <no.author@domain.net<\/a>>\r\ngfxadmin = gfxadmin <gfxadmin@domain.net<\/a>>\r\nroot = root <root@domain.net<\/a>>\r\nhttpd = httpd <httpd@domain.net<\/a>><\/pre>\n
Move old local SVN repositories<\/h4>\n
mkdir svn\r\nmv gluegen jogl jogl-demos svn\/<\/pre>\n
Converting to git<\/h3>\n
Preperation<\/h4>\n
mkdir git-svn\r\ncd git-svn<\/pre>\n
\nrepository, svn-all-fast-export\/samples\/merged-branches-tags.rules<\/em>, to this directory git-svn<\/em>.<\/span><\/p>\nConverting<\/h4>\n
cd git-svn<\/pre>\n
\nsed ‘s\/myproject\/gluegen\/g’ merged-branches-tags.rules > gluegen-merged-branches-tags.rules<\/span><\/p>\ngit svn --authors-file=.\/svn.authors clone -s file:\/\/`pwd`\/..\/svn-server-sync\/gluegen gluegen 2>&1 | tee gluegen.log<\/pre>\n
\nwhich we will fix within the next step. Don’t forget to check the log file, here gluegen.log.<\/p>\n
\nfix that error (add author-name to svn.authors) and continue:<\/p>\ncd gluegen\r\ngit svn --authors-file=..\/svn.authors fetch\u00a0 2>&1 | tee ..\/gluegen-2.log<\/pre>\n
Pick remote branches & manual tagging<\/h4>\n
cd git-svn\/gluegen<\/pre>\n
\nwe have to pick these and make them local.<\/p>\ngit branch -a\r\n* master\r\n remotes\/1.0b06-maint\r\n remotes\/1.0b06a\r\n remotes\/JOGL_2_SANDBOX\r\n remotes\/tags\/1.0b06\r\n remotes\/tags\/1.0b06a\r\n remotes\/trunk\r\ngit tag -l<\/pre>\n
\nwhich is easy at looking at the SVN<\/em> branches page<\/a>.\u00a0 Valid remote branches are 1.0b06-maint<\/em> and the JOGL_2_SANDBOX.<\/em>
\nThe below commands create local branches from the remote ones.
\n<\/em><\/p>\ngit checkout --track -b 1.0b06-maint remotes\/1.0b06-maint\r\ngit checkout --track -b JOGL_2_SANDBOX remotes\/JOGL_2_SANDBOX<\/pre>\n
1: git checkout --track -b tag_1.0b06 remotes\/tags\/1.0b06\r\n2: git checkout --track -b tag_1.0b06a remotes\/tags\/1.0b06a\r\n3: git checkout master\r\n4: git tag 1.0b06 tag_1.0b06\r\n5: git tag 1.0b06a tag_1.0b06a\r\n6: git branch -D tag_1.0b06 tag_1.0b06a\r\n7: git branch -a\r\n 1.0b06-maint\r\n JOGL_2_SANDBOX\r\n* master\r\n remotes\/1.0b06-maint\r\n remotes\/1.0b06a\r\n remotes\/JOGL_2_SANDBOX\r\n remotes\/tags\/1.0b06\r\n remotes\/tags\/1.0b06a\r\n remotes\/trunk\r\n8: git tag -l\r\n 1.0b06\r\n 1.0b06a\r\n9: git branch -r -D 1.0b06-maint 1.0b06a JOGL_2_SANDBOX tags\/1.0b06 tags\/1.0b06a trunk\r\nX: git branch -a\r\n 1.0b06-maint\r\n JOGL_2_SANDBOX\r\n* master<\/pre>\n
\nStep 3 switches back to the master branch
\nStep [4..5] creates tags from the local branches
\nStep 6 deletes the local branches, which we just have tagged.
\nStep 7 shows the branches
\nStep 8 shows the tags
\nStep 9 removes the remote branches, which disconnects us from the svn repository
\nStep X: shows the branches<\/p>\n
\nwithout the ref-path (remotes\/)<\/p>\n#! \/bin\/sh\r\n\r\nbranchfile=$1\r\nshift\r\n\r\nif [ -z \"$branchfile\" ] ; then\r\n echo Usage $0 branchfile containing branchnames without ref path\r\n exit 1\r\nfi\r\n\r\nfor i in `cat $branchfile` ; do\r\n git checkout --track -b $i remotes\/$i\r\n git checkout master\r\n git branch -r -D $i\r\ndone<\/pre>\n
\nwithout the ref-path (remotes\/tags\/)<\/p>\n#! \/bin\/sh\r\n\r\ntagfile=$1\r\nshift\r\n\r\nif [ -z \"$tagfile\" ] ; then\r\n echo Usage $0 tagfile containing tagnames without ref path\r\n exit 1\r\nfi\r\n\r\nfor i in `cat $tagfile` ; do\r\n git checkout --track -b tag_\"$i\" remotes\/tags\/$i\r\n git tag $i tag_\"$i\"\r\n git checkout master\r\n git branch -D tag_\"$i\"\r\n git branch -r -D tags\/$i\r\ndone<\/pre>\n
Cleanup<\/h4>\n
\r\n<\/pre>\n
1: cd git-svn\/gluegen\r\n2: git gc\r\n3: cd ..\r\n4: git clone --mirror gluegen gluegen.git<\/pre>\n
\nwe want to manually garbage collect (gc) our folder with the Step 2.
\nStep 4 creates a bare mirror clone of the cleaned up git repository, you may like to use this as a backup.<\/p>\nPublish git <\/em>repository to the server<\/h4>\n
cd git-svn\/gluegen.git<\/pre>\n
git push --mirror ssh:\/\/username@git.kenai.com\/gluegen~gluegen-git<\/a><\/pre>\n
git<\/em> Usage<\/h2>\n
Clone<\/h3>\n
1a: git clone git:\/\/kenai.com\/gluegen~gluegen-git<\/a>\u00a0 gluegen\r\n1b: git clone ssh:\/\/username@git.kenai.com\/gluegen~gluegen-git<\/a> gluegen\r\n2: cd gluegen\r\n3: git branch -a\r\n4: git remote show origin<\/pre>\n
\nwhere 1a<\/em> is the anonymous checkout and 1b<\/em> uses the SSH login shell remote connection,
\nthe latter is recommended for putbacks.<\/p>\nCheckout a remote tracked branch<\/h3>\n
\nyou have to checkout the remote one to become local, ie the JOGL_2_SANDBOX<\/em>.<\/p>\ngit remote show origin\r\ngit checkout --track -b JOGL_2_SANDBOX origin\/JOGL_2_SANDBOX\r\ngit checkout JOGL_2_SANDBOX<\/pre>\n
Switch local branches<\/h3>\n
git checkout JOGL_2_SANDBOX\r\ngit checkout master<\/pre>\n
Remove a remote branch on server<\/h3>\n
git branch --track my_branch origin\/master\r\ngit checkout my_branch\r\n.. changes ..\r\npit push --all<\/pre>\n
git checkout --track -b my_branch origin\/my_branch\r\ngit checkout my_branch\r\n.. changes ..\r\ngit push --all<\/pre>\n
\nand remove it on the server as well.<\/p>\n1: git branch -D my_branch\r\n2: git push origin :refs\/heads\/my_branch<\/pre>\n
\nStep 2 removes the branch my_branch<\/em> on the server repository.<\/p>\n1: git branch -r -D origin\/my_branch\r\n2: git fetch<\/pre>\n
Last but not least …<\/h3>\n
![git cheat sheet<\/a><\/li>\ngit crash course for svn users<\/a><\/li>\ngit documentation<\/a><\/li>\nmsysgit – git for MS Windows<\/a><\/li>\n<\/ul>\nSVN<\/em> to git<\/em> Conversion<\/h2>\nThe conversion demonstrated here is using the dev.java.net <\/em>gluegen repository as an example, we have converted the jogl <\/em>and jogl-demos<\/em> the same way.<\/p>\nWe have used git<\/em> version 1.6.3.3.<\/strong><\/p>\nInstead of using git-svn<\/em> directly, we utilize the tool svn-all-fast-export<\/em>, http:\/\/repo.or.cz\/w\/svn-all-fast-export.git,\n<\/a>which not only uses a fast local SVN<\/em> repository, but also migrates all local branches and tags to git<\/em> branches.\nThe latter is true, SVN<\/em> tags converted to git branches, since SVN<\/em> tags are actually branches.<\/span><\/p>\nUpdate: <\/em><\/strong>It turns out that the tool http:\/\/repo.or.cz\/w\/svn-all-fast-export.git<\/a>\nis not able to find the proper tag and branch points within the original repository,\nhence we will use git-svn<\/em><\/a>.<\/p>\nDirectory Layout<\/h3>\nWe assume the following layout ..<\/p>\n\/..\/JOGL\r\n\/..\/JOGL\/svn-server-sync\r\n\/..\/JOGL\/svn\r\n\/..\/JOGL\/git-svn<\/pre>\nAll subsequent action start from the root directory JOGL<\/em>.<\/p>\nSVN<\/em> Preperation<\/h3>\nClone Repository<\/h4>\nUpdate:<\/em><\/strong> This task is optional. However it is highly recommended since it dramatically speeds up the SVN<\/em> checkout process.<\/p>\nFirst we create a local clone of the SVN<\/em> repository. This is already tricky, since the svn<\/em> versions are not backward compatible,\ni.e. dev.java.net<\/em> SVN<\/em> repository cannot be synchronized with svn<\/em> version 1.6. The latest compatible version is svn<\/em> 1.5.2.\nHere we used an installed svn<\/em> version 1.4.4 from a MacOSX machine!<\/p>\n1: mkdir svn-server-sync\r\n2: cd svn-server-sync\r\n3: svnadmin create gluegen\r\n4: cp gluegen\/hooks\/pre-revprop-change.tmpl gluegen\/hooks\/pre-revprop-change\r\n5: vi gluegen\/hooks\/pre-revprop-change\r\n6: chmod ugo+x gluegen\/hooks\/pre-revprop-change\r\n7: svnsync --username userid --password pwd init file:\/\/`pwd`\/gluegen https:\/\/gluegen.dev.java.net\/svn\/gluegen<\/a>\r\n8: svnsync sync file:\/\/`pwd`\/gluegen<\/pre>\nStep [1..3] create the local SVN repository.<\/p>\nSteps [4..6] create the svn critical hook file and makes it writeable, while step 5 edits it as follows:<\/p>\ndiff -Nur gluegen\/hooks\/pre-revprop-change.tmpl gluegen\/hooks\/pre-revprop-change\r\n--- gluegen\/hooks\/pre-revprop-change.tmpl\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 2009-07-08 09:18:55.000000000 -0700\r\n+++ gluegen\/hooks\/pre-revprop-change\u00a0\u00a0\u00a0 2009-07-08 09:20:06.000000000 -0700\r\n@@ -60,6 +60,8 @@\r\n PROPNAME=\"$4\"\r\n ACTION=\"$5\"\r\n\r\n+exit 0\r\n+\r\n if [ \"$ACTION\" = \"M\" -a \"$PROPNAME\" = \"svn:log\" ]; then exit 0; fi\r\n\r\n echo \"Changing revision properties other than svn:log is prohibited\" >&2<\/pre>\nStep 7 links the local SVN repository\u00a0 to it’s remote master.<\/p>\nStep 8 finally pulls it down to our local copy.<\/p>\nThis is done for the jogl<\/em> and jogl-demos<\/em> repositories as well.<\/p>\nCreate author mapping file<\/h4>\nCreate a svn.authors<\/em> file, which maps the svn<\/em> author names to git<\/em> author names:<\/p>\n#!\/bin\/bash\r\nauthors=$(svn log -q | grep -e '^r' | awk 'BEGIN { FS = \"|\" } ; { print $2 }' | sort | uniq)\r\nfor author in ${authors}; do\r\n echo \"${author} = ${author} <${author}@dev.java.net>\" >> svn.authors ;\r\ndone<\/pre>\nUse the above script in all of your original checked-out svn repository directories (gluegen, jogl <\/em>and jogl-demos<\/em>) to catch all author names.\nFix the svn.authors<\/em> file’s email addresses if appropriate.\nAdd the mandatory author names:<\/p>\n(no author) = First Last <no.author@domain.net<\/a>>\r\ngfxadmin = gfxadmin <gfxadmin@domain.net<\/a>>\r\nroot = root <root@domain.net<\/a>>\r\nhttpd = httpd <httpd@domain.net<\/a>><\/pre>\nMove old local SVN repositories<\/h4>\nWe move away the old SVN checkouts ..<\/p>\nmkdir svn\r\nmv gluegen jogl jogl-demos svn\/<\/pre>\nConverting to git<\/h3>\nPreperation<\/h4>\nGet the tool svn-all-fast-export, http:\/\/repo.or.cz\/w\/svn-all-fast-export.git<\/a>, via git clone git:\/\/repo.or.cz\/svn-all-fast-export.git<\/a>, build and install it.<\/span><\/p>\nGo our parent directory JOGL<\/em>, where svn-server-sync<\/em> resides.<\/p>\nmkdir git-svn\r\ncd git-svn<\/pre>\nCopy the previously created svn.authors<\/em> file to this directory git-svn<\/em>.<\/p>\nCopy the file merged-branches-tags.rules<\/em> out of the checked out svn-all-fast-export.git<\/em>\nrepository, svn-all-fast-export\/samples\/merged-branches-tags.rules<\/em>, to this directory git-svn<\/em>.<\/span><\/p>\nConverting<\/h4>\ncd git-svn<\/pre>\nWe customize the svn-all-fast-export<\/em> configuration file, here for gluegen:<\/span>\nsed ‘s\/myproject\/gluegen\/g’ merged-branches-tags.rules > gluegen-merged-branches-tags.rules<\/span><\/p>\ngit svn --authors-file=.\/svn.authors clone -s file:\/\/`pwd`\/..\/svn-server-sync\/gluegen gluegen 2>&1 | tee gluegen.log<\/pre>\nThis task migrates the SVN<\/em> repository to git<\/em>, note that all tags of the SVN<\/em> repository are represented as branches within git<\/em>,\nwhich we will fix within the next step. Don’t forget to check the log file, here gluegen.log.<\/p>\nIn case somethings goes wrong, ie the task is incompete, e.g. due to a missing author-name mapping,\nfix that error (add author-name to svn.authors) and continue:<\/p>\ncd gluegen\r\ngit svn --authors-file=..\/svn.authors fetch\u00a0 2>&1 | tee ..\/gluegen-2.log<\/pre>\nPick remote branches & manual tagging<\/h4>\ncd git-svn\/gluegen<\/pre>\nThe converted repository has referenced branches to the remote SVN<\/em> origin,\nwe have to pick these and make them local.<\/p>\nAlso, as mentioned above, SVN<\/em> tags are actually branches, so we have to converted them to git<\/em> tags.<\/p>\ngit branch -a\r\n* master\r\n remotes\/1.0b06-maint\r\n remotes\/1.0b06a\r\n remotes\/JOGL_2_SANDBOX\r\n remotes\/tags\/1.0b06\r\n remotes\/tags\/1.0b06a\r\n remotes\/trunk\r\ngit tag -l<\/pre>\nThe above shows us a few remote branches and no tags.<\/p>\nWe have to distinguish the remote branches from the tags,\nwhich is easy at looking at the SVN<\/em> branches page<\/a>.\u00a0 Valid remote branches are 1.0b06-maint<\/em> and the JOGL_2_SANDBOX.<\/em>\nThe below commands create local branches from the remote ones.\n<\/em><\/p>\ngit checkout --track -b 1.0b06-maint remotes\/1.0b06-maint\r\ngit checkout --track -b JOGL_2_SANDBOX remotes\/JOGL_2_SANDBOX<\/pre>\nLast but not least, we have to manually create git <\/em>tags from the fake SVN<\/em> tags, which are visible as remotes\/tags\/*<\/em> branches.<\/p>\n1: git checkout --track -b tag_1.0b06 remotes\/tags\/1.0b06\r\n2: git checkout --track -b tag_1.0b06a remotes\/tags\/1.0b06a\r\n3: git checkout master\r\n4: git tag 1.0b06 tag_1.0b06\r\n5: git tag 1.0b06a tag_1.0b06a\r\n6: git branch -D tag_1.0b06 tag_1.0b06a\r\n7: git branch -a\r\n 1.0b06-maint\r\n JOGL_2_SANDBOX\r\n* master\r\n remotes\/1.0b06-maint\r\n remotes\/1.0b06a\r\n remotes\/JOGL_2_SANDBOX\r\n remotes\/tags\/1.0b06\r\n remotes\/tags\/1.0b06a\r\n remotes\/trunk\r\n8: git tag -l\r\n 1.0b06\r\n 1.0b06a\r\n9: git branch -r -D 1.0b06-maint 1.0b06a JOGL_2_SANDBOX tags\/1.0b06 tags\/1.0b06a trunk\r\nX: git branch -a\r\n 1.0b06-maint\r\n JOGL_2_SANDBOX\r\n* master<\/pre>\nStep [1..2] creates local branches with the prefix tag_ from the remote ones.\nStep 3 switches back to the master branch\nStep [4..5] creates tags from the local branches\nStep 6 deletes the local branches, which we just have tagged.\nStep 7 shows the branches\nStep 8 shows the tags\nStep 9 removes the remote branches, which disconnects us from the svn repository\nStep X: shows the branches<\/p>\nIn case you have many branches, you may use a simple shell script, fed with a file containing the branch names,\nwithout the ref-path (remotes\/)<\/p>\n#! \/bin\/sh\r\n\r\nbranchfile=$1\r\nshift\r\n\r\nif [ -z \"$branchfile\" ] ; then\r\n echo Usage $0 branchfile containing branchnames without ref path\r\n exit 1\r\nfi\r\n\r\nfor i in `cat $branchfile` ; do\r\n git checkout --track -b $i remotes\/$i\r\n git checkout master\r\n git branch -r -D $i\r\ndone<\/pre>\nIn case you have many tags, you may use a simple shell script, fed with a file containing the tag names,\nwithout the ref-path (remotes\/tags\/)<\/p>\n#! \/bin\/sh\r\n\r\ntagfile=$1\r\nshift\r\n\r\nif [ -z \"$tagfile\" ] ; then\r\n echo Usage $0 tagfile containing tagnames without ref path\r\n exit 1\r\nfi\r\n\r\nfor i in `cat $tagfile` ; do\r\n git checkout --track -b tag_\"$i\" remotes\/tags\/$i\r\n git tag $i tag_\"$i\"\r\n git checkout master\r\n git branch -D tag_\"$i\"\r\n git branch -r -D tags\/$i\r\ndone<\/pre>\nCleanup<\/h4>\n\r\n<\/pre>\n1: cd git-svn\/gluegen\r\n2: git gc\r\n3: cd ..\r\n4: git clone --mirror gluegen gluegen.git<\/pre>\nSince the conversion left a lot of dirt in the git<\/em> repository, and we have joggled around with a lot branches,\nwe want to manually garbage collect (gc) our folder with the Step 2.\nStep 4 creates a bare mirror clone of the cleaned up git repository, you may like to use this as a backup.<\/p>\nPre cleanup: 15MByte, post cleanup 6.6MByte, bare mirror 2.7M.<\/p>\nPublish git <\/em>repository to the server<\/h4>\ncd git-svn\/gluegen.git<\/pre>\nNow we push our conversion to the git<\/em> server’s repository:<\/p>\ngit push --mirror ssh:\/\/username@git.kenai.com\/gluegen~gluegen-git<\/a><\/pre>\nThe mirror option ensures a 1:1 copy including all branches and tags.<\/p>\ngit<\/em> Usage<\/h2>\nWe assume to be in our root directory JOGL<\/em>.<\/p>\nNo more gluegen<\/em>, jogl<\/em> or jogl-demos<\/em> directory exist anymore, since we moved it away to the new subdirectory svn<\/em>.<\/p>\nClone<\/h3>\n1a: git clone git:\/\/kenai.com\/gluegen~gluegen-git<\/a>\u00a0 gluegen\r\n1b: git clone ssh:\/\/username@git.kenai.com\/gluegen~gluegen-git<\/a> gluegen\r\n2: cd gluegen\r\n3: git branch -a\r\n4: git remote show origin<\/pre>\nStep 1a<\/em> or 1b<\/em> creates the local gluegen git<\/em> clone in the directory gluegen<\/em>,\nwhere 1a<\/em> is the anonymous checkout and 1b<\/em> uses the SSH login shell remote connection,\nthe latter is recommended for putbacks.<\/p>\nStep 2 cd’s into it.<\/p>\nStep 3 lists all branches.<\/p>\nStep 4 shows remote tracked branches<\/p>\nCheckout a remote tracked branch<\/h3>\nIn case you like to browse around within some branch, which is not yet local, ie remote,\nyou have to checkout the remote one to become local, ie the JOGL_2_SANDBOX<\/em>.<\/p>\ngit remote show origin\r\ngit checkout --track -b JOGL_2_SANDBOX origin\/JOGL_2_SANDBOX\r\ngit checkout JOGL_2_SANDBOX<\/pre>\nThen you can switch between local branches as usual ..<\/p>\nSwitch local branches<\/h3>\ngit checkout JOGL_2_SANDBOX\r\ngit checkout master<\/pre>\nRemove a remote branch on server<\/h3>\nYou may have created and published the new branch my_branch<\/em> derived from master<\/em>:<\/p>\ngit branch --track my_branch origin\/master\r\ngit checkout my_branch\r\n.. changes ..\r\npit push --all<\/pre>\n.. or you were using a remote branch ..<\/p>\ngit checkout --track -b my_branch origin\/my_branch\r\ngit checkout my_branch\r\n.. changes ..\r\ngit push --all<\/pre>\nNow we like to remove the branch my_branch<\/em>,\nand remove it on the server as well.<\/p>\n1: git branch -D my_branch\r\n2: git push origin :refs\/heads\/my_branch<\/pre>\nStep 1 removes the branch my_branch<\/em> in the local repository.\nStep 2 removes the branch my_branch<\/em> on the server repository.<\/p>\nAnother user may want to clean up the local repository, ie remove a tracked remote branch:<\/p>\n1: git branch -r -D origin\/my_branch\r\n2: git fetch<\/pre>\nLast but not least …<\/h3>\n.. participation and contributions<\/a>.<\/p>\nGit’s<\/em> model is not<\/strong> really layed out for central SCM,\nsure it can be abused as such, as you have seen above.<\/p>\nIt’s real powers are it’s distribution qualities<\/strong>!<\/p>\nEither a contributor has it’s own repository online via a webserver or ssh access,\nor she can send the patch via email.\nHowever it is offered to an integrator within the chain of trust (in a project),\nshe asks the integrator to pull the branch via the mentioned online or email content.\nThe integrator then verifies the patch somehow and merges it to her own branch, etc etc.\nThese are the key features of git<\/em>,\na very reliable high performance branching<\/strong> and merging<\/strong>.<\/p>\n","protected":false},"excerpt":{"rendered":"Preface Abandoning SVN in our projects (gluegen, jogl and jogl-demos) for the various reasons, http:\/\/git.or.cz\/gitwiki\/GitSvnComparsion, we had to choose a new SCM.<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"inline_featured_image":false,"footnotes":""},"categories":[3,8,6],"tags":[15,44,38,19],"class_list":["post-126","post","type-post","status-publish","format-standard","hentry","category-computer-stuff","category-jogamp","category-scm","tag-git","tag-jogamp","tag-scm","tag-svn"],"_links":{"self":[{"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/posts\/126","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/comments?post=126"}],"version-history":[{"count":1,"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/posts\/126\/revisions"}],"predecessor-version":[{"id":591,"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/posts\/126\/revisions\/591"}],"wp:attachment":[{"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/media?parent=126"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/categories?post=126"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/jausoft.com\/blog\/wp-json\/wp\/v2\/tags?post=126"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}](\"http:\/\/ktown.kde.org\/~zrusin\/git\/git-cheat-sheet-medium.png\"){kind=link}