Updating SVN

[Cephaler]

Hello guys, first, thanks for the amazing job you guys have been doing.

Second:

I use rathena for my server and I see everyday there's a bug fix/svn update sometimes more than one per day.

Question is:

I have made changes to src/some files in other to customize my server, added things, scripts etc.

1; How do I update the SVN without overwriting/deleting the customization I've made?

Thanks!

[Mystery]

Hello guys, first, thanks for the amazing job you guys have been doing.

Second:

I use rathena for my server and I see everyday there's a bug fix/svn update sometimes more than one per day.

Question is:

I have made changes to src/some files in other to customize my server, added things, scripts etc.

1; How do I update the SVN without overwriting/deleting the customization I've made?

Thanks!

Taken from the IRC:

<Flaid>: you have to merge it in manually

<Flaid>: if you have custom edits

<Flaid>: on that files

<Flaid>: D:

<Cephaler>: ouch ;-(

<Flaid>: else make patch/diff files of your custom edits, update your rA svn and patch in your edits <Cephaler>: or just don't update rathena

<Cephaler>: ._.

<Cephaler>: lol

<Flaid>: or that

<Flaid>: do what i do and just merge in updates you need

Basically you want a working copy of your server on your desktop and just update the folder with TortoiseSVN and the files that get updated/merged, transfer them over to your VPS.

Also, depending on what you use.. you can search the forums.

Linux

Wiki

[Spre]

I recommend NOT running the server directory from your svn directory, then you do not have to worry about it, just update your svn, make all your custom edits, compile, copy over.

1; How do I update the SVN without overwriting/deleting the customization I've made?

[Akkarin]

Have you all gone crazy? o.O

Subversion is designed to merge working directory with new content - it takes into account that the user may have modified data and carries out the updates/merges accordingly o_o

[nanakiwurtz]

Many users afraid their data will be overwritten during the 'SVN Update' process.. A patch may be a good temporary solution for this

[Akkarin]

The svn update function doesn't overwrite anything. If it detects a conflict, the program tells you about it then adds >>>>>>>>, =========== and <<<<<<<< to the files for you deal with.

If using windows, tortoisesvn has a function to deal with conflicts.

Linux prompts you, usually you would hit "e" on your keyboard to edit the file, then save-exit, then hit "r" to mark it as resolved and it'll carry on with the update.

There's no need to over-complicate a process that's been simple to do for years.

[Cephaler]

Have you all gone crazy? o.O

Subversion is designed to merge working directory with new content - it takes into account that the user may have modified data and carries out the updates/merges accordingly o_o

Wait I don't understand.. so if I right click on the folder and click on SVN update it won't delete my changes? even if I have changes on the same file that got updated?

Edited September 30, 2012 by Cephaler

[Bin4ry]

Yes. It will merge your changes and the update changes instead.

Like Akkarin mention, if it detect conflict in ur update and current svn diff, TortoiseSVN will tell you.

Edited September 30, 2012 by darristan

[Cephaler]

Yes. It will merge your changes and the update changes instead.

Like Akkarin mention, if it detect conflict in ur update and current svn diff, TortoiseSVN will tell you.

Thank you! That saves a lot of time!