Difference between revisions of "Git svn"

From relax wiki
Jump to navigation Jump to search
Line 39: Line 39:
 
  git remote show origin
 
  git remote show origin
  
Now go to github.com at https://github.com/nmr-relax/trunk and click '''Fork'''.<br>
+
Now go to github.com at https://github.com/GIT_USER_NAME click '''Repositories -> New'''.<br>
 +
Call it '''relax_trunk'''. We want to preserve history , so do not '''Initialize this repository with a README''' or anything like, README or .gitignore. <br>
 +
 
 
Now add this as a private remote, by setting the remote name '''hub'''.
 
Now add this as a private remote, by setting the remote name '''hub'''.
  git remote add hub https://GIT_USER_NAME@github.com/GIT_USER_NAME/trunk.git
+
  git remote add hub https://GIT_USER_NAME@github.com/GIT_USER_NAME/relax_trunk.git
 +
 
 +
Then send svn branch master of to github
 +
git push -u hub master
  
 
=== For branch relax_disp ===
 
=== For branch relax_disp ===
Line 52: Line 57:
 
  git remote show origin
 
  git remote show origin
  
Now go to github.com at https://github.com/nmr-relax/relax_disp and click '''Fork'''.<br>
+
Now go to github.com at https://github.com/GIT_USER_NAME click '''Repositories -> New'''.<br>
 +
Call it '''relax_disp'''. We want to preserve history , so do not '''Initialize this repository with a README''' or anything like, README or .gitignore. <br>
 +
 
 
Now add this as a private remote, by setting the remote name '''hub'''.
 
Now add this as a private remote, by setting the remote name '''hub'''.
 
  git remote add hub https://GIT_USER_NAME@github.com/GIT_USER_NAME/relax_disp.git
 
  git remote add hub https://GIT_USER_NAME@github.com/GIT_USER_NAME/relax_disp.git
  
== git operations ==
 
Now create a repository at your private github account. Do not check anything in like, README or .gitignore. We want to preserve history!
 
 
 
Then send svn branch master of to github
 
Then send svn branch master of to github
  git push hub master
+
  git push -u hub master
  
We need to make a setting [http://stackoverflow.com/questions/948354/git-push-current-branch how we push branches.]
+
== git operations ==
 +
You may need to make a setting [http://stackoverflow.com/questions/948354/git-push-current-branch how we push branches.]
 
  git config push.default simple
 
  git config push.default simple
 
First get the latest changes from remote
 
git pull hub master
 
git log
 
  
 
= See also =
 
= See also =
 
[[Category:git]]
 
[[Category:git]]

Revision as of 13:35, 22 July 2013

Background

How import in github was done

Based on these posts and on this recommended post, and also this post.

You should install msysgit on windows, to do the checkout.

md C:\WinPython27\relax
cd C:\WinPython27\relax

To clone from a revision number, use -r NR. This will tell which revision to start taking history from. If you want to include all of the history, just leave that option off, but it will take a very long time, and you really don't need all of it. The older a revision you choose, the longer it will take to import. But you will not be able to "git blame" past the earliest revision you import.

You also need an authors.txt file, to correctly convert the metadata.

git svn clone http://svn.gna.org/svn/relax/trunk --no-metadata -A authors.txt
git svn clone -r 20000:HEAD http://svn.gna.org/svn/relax/trunk --no-metadata -A authors.txt
git svn clone http://svn.gna.org/svn/relax/branches/relax_disp --no-metadata -A authors.txt
git svn clone -r 20000:HEAD http://svn.gna.org/svn/relax/branches/relax_disp --no-metadata -A authors.txt
#Build
cd trunk
scons
cd ..
cd relax_disp
scons

For futurev updates to the SVN revision HEAD, you now need to do a git svn rebase, which is very similar to: svn up

git svn rebase

Check branch information

git branch -a

Setup remotes to github

For branch trunk

cd C:\WinPython27\relax\trunk
git remote add origin https://github.com/nmr-relax/trunk.git
# If you are a member of the organization, with writing permissions, then do:
git remote add origin https://GIT_USER_NAME@github.com/nmr-relax/trunk.git
# See the info
git remote -v
git remote show origin

Now go to github.com at https://github.com/GIT_USER_NAME click Repositories -> New.
Call it relax_trunk. We want to preserve history , so do not Initialize this repository with a README or anything like, README or .gitignore.

Now add this as a private remote, by setting the remote name hub.

git remote add hub https://GIT_USER_NAME@github.com/GIT_USER_NAME/relax_trunk.git

Then send svn branch master of to github

git push -u hub master

For branch relax_disp

cd C:\WinPython27\relax\relax_disp
git remote add origin https://github.com/nmr-relax/relax_disp.git
# If you are a member of the organization, with writing permissions, then do:
git remote add origin https://GIT_USER_NAME@github.com/nmr-relax/relax_disp.git
# See the info
git remote -v
git remote show origin

Now go to github.com at https://github.com/GIT_USER_NAME click Repositories -> New.
Call it relax_disp. We want to preserve history , so do not Initialize this repository with a README or anything like, README or .gitignore.

Now add this as a private remote, by setting the remote name hub.

git remote add hub https://GIT_USER_NAME@github.com/GIT_USER_NAME/relax_disp.git

Then send svn branch master of to github

git push -u hub master

git operations

You may need to make a setting how we push branches.

git config push.default simple

See also