How to update my svn without losing anything.

[Tales]

I need to up to date my svn. How can i do it?

 

@EDIT

 

Using Linux Host via Putty and Command-line.

 

 

@EDIT

 

 

http://rathena.org/board/topic/56504-help-how-to-update-svn-version/

 

@EDIT

 

I have many changes in my src. I'll lost it?

Edited October 2, 2014 by Tales

[Antares]

I sincerely hope you are not using the SVN repo, since it was abandoned. We use GIT. You can use the SVN client to pull from the GIT repo, so there's no problem, but if you used the SVN repo till this point, you will need to check yout a new server from the GIT repo. You can copy-paste your configs and npcs, so those and your stored data will be intact, but source mods will be gone.

 

If you used GIT previously, just do a regular update, and when prompted because of conflicts, choose as you wish (use server version/use your version/merge)

[kitty14]

For git check guide here

[Tales]

Sorry for my mistake. Im using GIT. I want to know how to update him.

[kitty14]

Sorry for my mistake. Im using GIT. I want to know how to update him.

check this

http://rathena.org/board/topic/87120-transitioning-from-svn-to-git/

[Winz]

update the GIT?
1. go to your rA's folder, untill you can see "runserver.bat" or "athena-start"
2. <command> git stash
3. git pull
4. git stash pop
 
then, git will tell you that there are differences.
The rest are here: https://rtcamp.com/tutorials/git/git-resolve-merge-conflicts/
(skip "Find files with merge conflict")

[Tales]

update the GIT?

1. go to your rA's folder, untill you can see "runserver.bat" or "athena-start"

2. <command> git stash

3. git pull

4. git stash pop

 

then, git will tell you that there are differences.

The rest are here: https://rtcamp.com/tutorials/git/git-resolve-merge-conflicts/

(skip "Find files with merge conflict")

 

Let me try it now...

@EDIT

Look this 

 

fatal: Not a git repository (or any of the parent directories): .git

Edited October 1, 2014 by Tales

[Winz]

it is caused because the folder IS NOT a git folder.

a git folder shall have .git folder inside it and is hidden.

 

maybe, you want to do SVN transitioning to GIT for this. IDK..http://rathena.org/wiki/Transition_from_SVN_to_GIT

 

or I can suggest you this:

1. git clone from rA's GIT (git clone https://github.com/rathena/rathena.git ~/rAthena)

2. merge the modified files between your old one and the fresh one

 

that's it. google for any references. I can't explain about merging.

[Tales]

Thanks! Problem Solved!