Euphy

Transitioning from SVN to GIT

Recommended Posts

Transitioning from SVN to GIT

While switching your server to GIT may sound like a daunting task, it's relatively simple and straightforward, even for servers with heavy modifications. We strongly encourage you to do so, since our primary efforts will now be directed towards our repository on GitHub. Simply follow the steps listed below, depending on your OS:

Windows Instructions

For this process, we'll be using msysgit and TortoiseGit. Download and install both (in that order) if you don't have them already.

  • In TortoiseGit, right-click and select "Git Clone..." where you want to create your new repository.

    ULa1u8a.jpg

  • Enter rAthena's GitHub URL and hit "OK":
    https://github.com/rathena/rathena
    czNpAgf.jpg

  • Cloning may take a minute or two. Hit "Close" after it finishes.

    dgF5HRl.jpg

  • Update your SVN repository using TortoiseSVN's "SVN Update".

    9HNDSej.jpg

  • Hit "OK" after it finishes. Resolve any conflicts now (read more below).

    5ww9HK7.jpg

  • Copy all files in your SVN directory, excluding the .svn folder itself.

    gNTwT7B.jpg

  • In your new GIT directory, paste the files you just copied.

    QDXu3Rq.jpg

  • When prompted, opt to merge all folders and replace all files.

    N9psegA.jpg

    iOeYCNr.jpg

  • In TortoiseGit, right-click and select "Stash Save" to store all your changes.

    tVyxmsw.jpg

  • Create a name that you'll recognize later, like "Update to Latest".

    0YPzXbf.jpg


That's it, you're finished. When you want to update your GIT repository, follow these steps:

  • Right-click and select "Pull..." to merge all new changes.

    JSjpp8l.jpg

    Fna1kfs.jpg

  • Right-click and select "Stash Pop" to restore your custom changes.

    GwvsyxR.jpg

    sg3BF4Z.jpg

Linux Instructions

  • Clone the GIT repository:
    git clone https://github.com/rathena/rathena.git
    This creates the new directory named "rathena" and will be the new server location, but can be changed is desired.

  • Update SVN Repo to latest:
    svn co http://svn.code.sf.net/p/rathena/svn/trunk/
    You can solve conflicts later, but it's best to do it now and make sure you can compile, and even test the server, before continuing.

  • Copy the files over:
    cp -rf trunk/* rathena/
    Recursive tag to copy all sub-directories and files, forced so you don't have to manually accept overwriting each file.

  • Configure and compile new GIT server location:
    ./configure && make clean sql
    If there are any specific functions you enable when configuring, modify this command.

  • Shut down old server and start-up new one.

    If you have any server auto-restart scripts, you can either edit the cronjob to point to a new location, or rename directories:

    mv trunk trunk-bak && mv rathena trunk
  • You can now pull GIT changes by typing:
    git pull
Notes about GIT:

*These commands assume you have changed directory to new GIT directory.

 

When doing a pull, you may receive a message saying:

 

Please, commit your changes or stash them before you can merge.

Aborting

 

In order to pull changes into your local repository, you have a couple options.  The one which will be most used by our users is going to be to stash the changes and recall these changes after a pull.  If you're just starting using GIT, then you'll need to configure a name and email before doing a stash.

 

git config --global user.email "[email protected]"
git config --global user.name "Your Name"
 

Now, stash local changes:

 

git stash save "Update to Latest"
"Update to Latest" can be anything, it's just a note.

 

Do the pull - Followed by a 'pop' to replace your code:

 

git pull
git stash pop
 

No conflicts?  You're good to complete your update!  Otherwise, keep reading...

Conflicts

It's possible that you'll run into conflicts along the way, with messages such as:

 

CONFLICT (content): Merge conflict in src/map/atcommand.c

 

When you see these messages, a conflict in merging your code occurred.  Much like resolving code conflicts in SVN, these conflicts create points within the files which show your code compared to the code pulled from the remote repo.  To fix them, open your files and find the conflict locations denoted by:

 

<<<<<<<: Indicates the start of the lines that had a merge conflict.

=======: Indicates the break point used for comparison. Breaks up changes that user has committed (above) to changes coming from merge (below) to visually see the differences.

>>>>>>>: Indicates the end of the lines that had a merge conflict.

 

Then you can choose which piece of code you wish to keep.  After all shown conflicts are corrected, you can continue your normal update process.

 

References

Credits to @Akinari for writing a good part of this guide.
  • Upvote 6

Share this post


Link to post
Share on other sites

I don't think you wanted to copy .svn file to I suggest:

rsync -r --exclude .svn trunk/ rathena

that should be way more faster

  • Upvote 1

Share this post


Link to post
Share on other sites

still the updates in Git and SVN will be the same? and lastly, we can directly download from Git without updating the old trunk? *(For Newbies)



i hope the SVN will be alive, dont kill it! downloading via git is too hard for me

Share this post


Link to post
Share on other sites

Hello,

 

you might read about GIT vs. SVN before you decide to stick to SVN

https://git.wiki.kernel.org/index.php/GitSvnComparison

 

GIT has many advantages over SVN and there's a good reason of why GitHub and GIT are the common choice for developers nowadays

 

In any case, you can also pull the GitHub repository with SVN, just use the following URL

https://github.com/rathena/rathena

and it should pull via SVN nicely.

For more information about that read https://help.github.com/articles/which-remote-url-should-i-use

Edited by DarkDevine
  • Upvote 1

Share this post


Link to post
Share on other sites

Is there anyway to download git updates in rar files like in svn-___- this git stuff is so complicated

 

 
  • Copy the files over:
    cp -rf trunk/* rathena/
    Recursive tag to copy all sub-directories and files, forced so you don't have to manually accept overwriting each file.

 

 

 

 

When I type this, it asks me to overwrite each file one by one. how do  I exactly type this so it overwrites all files?

Edited by Phenex

Share this post


Link to post
Share on other sites

Do I need to copy .git folder too? because when I do a clone it has a .git folder and my when I do a SVN checkout it has a .git folder too. What do I have to override?

Share this post


Link to post
Share on other sites

hum about this what is the real order??? copy .git to svn  or svn to .git?

Share this post


Link to post
Share on other sites

after i stash save

 

run these right? then it will still save my old settings right?

 

git pull
git stash pop
 

what happend if i forgot to to stash pop? replaced? 

Share this post


Link to post
Share on other sites

when i command " git clone https://github.com/rathena/rathena.git "

problem=>  command not found

 

why?

Share this post


Link to post
Share on other sites

when i command " git clone https://github.com/rathena/rathena.git "

problem=>  command not found

 

why?

 

 

install git

If you're using CentOS x = yum -y install git

 

If you're using Debian/Ubuntu = apt-get install git

Edited by Saiku
  • Upvote 1

Share this post


Link to post
Share on other sites

when i command " git clone https://github.com/rathena/rathena.git "

problem=>  command not found

 

why?

 

 

install git

If you're using CentOS x = yum -y install git

 

If you're using Debian/Ubuntu = apt-get install git

problem > You need to be root to perform this command.

i try cd server or cd trunk, but same error"You need to be root to perform this command."

 

i'm using centOS

 

Share this post


Link to post
Share on other sites

 

when i command " git clone https://github.com/rathena/rathena.git "

problem=>  command not found

 

why?

 

 

install git

If you're using CentOS x = yum -y install git

 

If you're using Debian/Ubuntu = apt-get install git

problem > You need to be root to perform this command.

i try cd server or cd trunk, but same error"You need to be root to perform this command."

 

i'm using centOS

 

 

..Then login as root or

 

su yum install git

Share this post


Link to post
Share on other sites

How can I merge the new updates with my edited files?..

like what is the command? It's not very clear on the guide.

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now