[Linux Problem] rA updates conflicting my custom settings.

[Jezu]

Hello rA community,

I wanted to know how to make this..

If I update my current SVN (rA), there is a conflict and it will change my custom settings, I wanted to know how to keep my custom settings while applying the SVN changes.

Thanks a lot rA and more powers!

[Emistry]

you can create a diff using your current svn that contain your custom settings...

but not sure it can apply in future svn since the structures / contains might have changed

the way i use.....redo everything..xD hahaha

maybe there is other way....not sure.

[Jezu]

there's a command appearing on linux listed..

tf = theirs-full (if I choose this, all my custom settings will gone)

mf = mine-full (if I choose this, my custom settings will stay but the updates will not be applied)

[Linkin Park]

I check first what my current revision is, then check all files that will be affected by the update, back it up, then update. If there's a conflict I use mine-conflict or mine-full then just apply the updates manually.

Or your custom settings isn't that 'huge' re-do it with a fresh svn like what Emistry said

[Elijah23]

were this settings based on battle conf? if they are based there, the best thing to do is copy all the custom settings you have made in the battle.txt in import folder same with other settings that can be place there

[Jezu]

I check first what my current revision is, then check all files that will be affected by the update, back it up, then update. If there's a conflict I use mine-conflict or mine-full then just apply the updates manually.

Or your custom settings isn't that 'huge' re-do it with a fresh svn like what Emistry said

So I don't have an option but to re-do all the things that I made?

were this settings based on battle conf? if they are based there, the best thing to do is copy all the custom settings you have made in the battle.txt in import folder same with other settings that can be place there

My battle configs are on import so no worries on that... I just having a problem in src, db's and some npc to make my needs on my server.

[Elijah23]

What I usually do is checkout 2 SVNs..

One who gets the updates automatically and one for my customizations..

Make a patch for your source files and make your own svn..

[Jezu]

In tortoise, you can merge your changes while the updates applied... I don't know what command do I need on Linux to make like this..

[Elijah23]

yeah you can merge the changes in tortoise that's why I do it on my own computer..

When the changes merged, I'll then commit the changes in my own svn where in my working copy in linux will get the updates..

[Jezu]

yeah you can merge the changes in tortoise that's why I do it on my own computer..

When the changes merged, I'll then commit the changes in my own svn where in my working copy in linux will get the updates..

some custom settings of mine and rA updates is merged when I use diff-full (df) and then resolve ( r).. but if the updates is bigger, it will change everything to the updates and your custom settings will gone... I hope there is an alternative way for this.

[Jezu]

*bump*

I just wanted to know how this will be solved.

[GreenBox]

This is why the import-tmpl dir exists, rename it to import and place your settings in those files.

[Jezu]

This is why the import-tmpl dir exists, rename it to import and place your settings in those files.

Yeah, but I also have source modification and edited npc which is some are come from svn.. its really hard to manually update so my custom one will not be changed.

[Spre]

It is pretty simple...

svn diff mychangedfile1 dir1/dir2/mychangeresource2 > mypatch.txt

to create a diff with your custom settings, this WILL include NPC's as they are in the SVN

to apply the patch after you update to latest

patch -p0 < patch.txt

if you get an unknocown command error then you need patch.

now I will assume you have a redhat centos tye system if so just

yum install patch

if that gets nothing then

yum search patch

if still nothing you need more repos, in that case run the following commands

FIRST:

wget http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.2-2.el5.rf.i386.rpm

THEN:

rpm -ivh rpmforge-release-0.5.2-2.el5.rf.i386.rpm

that installs the rpmforge repo

THEN:

wget -q -O - http://www.atomicorp.com/installers/atomic | sh ; yum update

this installs AND updates with the atomic repo, atomic has ALOT of updated packages that the default repos have.

[Winz]

solved? change the category of the thread to solved. change it by full-editing the first post