SVN #187 vs. Latest SVN - RunUO

nadious · 10-02-2007, 08:43 PM

... what IS the latest SVN? I'm not even sure.

When I first started off, I was using the RC1 release. After running into some trouble with some scripts and such, I decided that I would take the plunge and attempt to upgrade to the the latest SVN at the time... 187. After a few hours of not knowing what in the world I was doing... I managed to get it working right and we did the upgrade correctly.

Now, it's been sometime... and I find myself asking if I should upgrade my version of the SVN to the latest, but I do have a few questions:

1. I know how to compile the core and all... but as far as scripts, does the scripts portion of the install require that you replace ALL the stock scripts? Or, does it only publish the ones that have been changed since your last SVN download? (And if so... not sure how to go about finding that out.)

2. My clients right now have to stop at the 6.0.1.6 patch... because the later patches don't work with 187. I understand that after a certain SVN, they addressed it and fixed it. Is it WORTH patching up to the latest client? I know it's always best to have the latest client (or so I'm told), but is there any advantage (features) of upgrading vs. staying where I'm at?

I know that some of my stock script changes (like playermobile, basehouse, etc) will have to be changed once I do the upgrade... but I guess I'm trying to find out if upgrading to the latest SVN is really worth it... or can I stay at 187 for awhile until there is some kind of 'major' upgrade that is released in later SVNs?

Any advice?

**Zippy** · 10-02-2007, 09:06 PM

Assuming you left in all those ".svn" folders when you last updated, doing an SVN Update now will automatically download all scripts and MERGE them with the ones you have, even if you changed them. This is distinctly different from REPLACING them. When they are MERGED, the changes go in and you don't have to do anything unless your changes are on the same lines as other changes, in which case SVN will warn you, and save backups of the file, and leave you to "resolve" the "conflict" manually
If you didn't change very much, the merge will go off without a hitch. Make a copy and give it a try.

nadious · 10-02-2007, 09:38 PM

Oh... THAT'S GREAT to know.

I had done the download and compile on another computer and when I was done, I move it to the actual shard server box and did the changes and such on there.

So, what I should do then (assuming I understand you correctly), is when I actually do the download for the latest SVN:

1. Download the SVN
2. Compile the core .exe
3. Replace my scripts (because I'm assuming I can't merge them at this point)
4. Run the shard and fix any lines of broken code that I get.

After I'm done with that, I should copy the folder BACK to where the SVN was, and I'll be able to then MERGE it for future use when updating the SVN? (I'm hoping I understand you there.)

Courageous · 10-02-2007, 11:10 PM

BTW, when you have commit privileges to SVN, something similar happens to what Zippy described, only in reverse. Imagine that you made changes to your scripts. And then Zippy made changes to his. He commits his to the repo. Then you commit yours. Assuming there are no conflicts, it just all magically resolves. If there are conflicts, SVN will tell you about them, and give you the opportunity to fix them up.

C//

nadious · 10-03-2007, 12:53 AM

Cool. So, I'll probably have to the changes manually this first initial time, because I don't have to original .svn folder anymore, right?

Courageous · 10-03-2007, 01:12 AM

I believe you are right.

Next time, when you check out of svn, you don't want to erase its chicken tracks. Best thing to do now is to recheckout in a whole new directory, and then use a directory and file diffferencing tool to figure out which of your files and changes need to be laid over SVN.

C//

nadious · 10-03-2007, 01:14 AM

Ok... I think I'm beginning to get it. (I'm a little slow.. heheheh.)

So, when I download the new SVN... I need to basically keep that directory as my server directory from where I run the game... and that way, I can just do the update on it and it will take care of all the merging, provided there is no conflict, right?

10-02-2007, 08:43 PM	#1 (permalink)
nadious Forum Expert Join Date: Jan 2003 Location: (Near) Atlanta, GA Posts: 369	SVN #187 vs. Latest SVN ... what IS the latest SVN? I'm not even sure. When I first started off, I was using the RC1 release. After running into some trouble with some scripts and such, I decided that I would take the plunge and attempt to upgrade to the the latest SVN at the time... 187. After a few hours of not knowing what in the world I was doing... I managed to get it working right and we did the upgrade correctly. Now, it's been sometime... and I find myself asking if I should upgrade my version of the SVN to the latest, but I do have a few questions: 1. I know how to compile the core and all... but as far as scripts, does the scripts portion of the install require that you replace ALL the stock scripts? Or, does it only publish the ones that have been changed since your last SVN download? (And if so... not sure how to go about finding that out.) 2. My clients right now have to stop at the 6.0.1.6 patch... because the later patches don't work with 187. I understand that after a certain SVN, they addressed it and fixed it. Is it WORTH patching up to the latest client? I know it's always best to have the latest client (or so I'm told), but is there any advantage (features) of upgrading vs. staying where I'm at? I know that some of my stock script changes (like playermobile, basehouse, etc) will have to be changed once I do the upgrade... but I guess I'm trying to find out if upgrading to the latest SVN is really worth it... or can I stay at 187 for awhile until there is some kind of 'major' upgrade that is released in later SVNs? Any advice?

10-02-2007, 09:06 PM	#2 (permalink)
Zippy Administrator Join Date: Aug 2002 Location: Baltimore, MD Age: 25 Posts: 4,868	Assuming you left in all those ".svn" folders when you last updated, doing an SVN Update now will automatically download all scripts and MERGE them with the ones you have, even if you changed them. This is distinctly different from REPLACING them. When they are MERGED, the changes go in and you don't have to do anything unless your changes are on the same lines as other changes, in which case SVN will warn you, and save backups of the file, and leave you to "resolve" the "conflict" manually If you didn't change very much, the merge will go off without a hitch. Make a copy and give it a try. __________________ Zippy, Razor Creator and RunUO Core Developer The RunUO Software Team "Intuition, like a flash of lightning, lasts only for a second. It generally comes when one is tormented by a difficult decipherment and when one reviews in his mind the fruitless experiments already tried. Suddenly the light breaks through and one finds after a few minutes what previous days of labor were unable to reveal." ~The Cryptonomicon

Thread Tools
Show Printable Version Email this Page
Display Modes
Linear Mode Switch to Hybrid Mode Switch to Threaded Mode

10-02-2007, 09:38 PM	#3 (permalink)
nadious Forum Expert Join Date: Jan 2003 Location: (Near) Atlanta, GA Posts: 369	Oh... THAT'S GREAT to know. I had done the download and compile on another computer and when I was done, I move it to the actual shard server box and did the changes and such on there. So, what I should do then (assuming I understand you correctly), is when I actually do the download for the latest SVN: 1. Download the SVN 2. Compile the core .exe 3. Replace my scripts (because I'm assuming I can't merge them at this point) 4. Run the shard and fix any lines of broken code that I get. After I'm done with that, I should copy the folder BACK to where the SVN was, and I'll be able to then MERGE it for future use when updating the SVN? (I'm hoping I understand you there.)

10-02-2007, 11:10 PM	#4 (permalink)
Courageous Forum Expert Join Date: Nov 2005 Location: San Diego, CA Posts: 1,824	BTW, when you have commit privileges to SVN, something similar happens to what Zippy described, only in reverse. Imagine that you made changes to your scripts. And then Zippy made changes to his. He commits his to the repo. Then you commit yours. Assuming there are no conflicts, it just all magically resolves. If there are conflicts, SVN will tell you about them, and give you the opportunity to fix them up. C//

10-03-2007, 12:53 AM	#5 (permalink)
nadious Forum Expert Join Date: Jan 2003 Location: (Near) Atlanta, GA Posts: 369	Cool. So, I'll probably have to the changes manually this first initial time, because I don't have to original .svn folder anymore, right?

10-03-2007, 01:12 AM	#6 (permalink)
Courageous Forum Expert Join Date: Nov 2005 Location: San Diego, CA Posts: 1,824	I believe you are right. Next time, when you check out of svn, you don't want to erase its chicken tracks. Best thing to do now is to recheckout in a whole new directory, and then use a directory and file diffferencing tool to figure out which of your files and changes need to be laid over SVN. C//

10-03-2007, 01:14 AM	#7 (permalink)
nadious Forum Expert Join Date: Jan 2003 Location: (Near) Atlanta, GA Posts: 369	Ok... I think I'm beginning to get it. (I'm a little slow.. heheheh.) So, when I download the new SVN... I need to basically keep that directory as my server directory from where I run the game... and that way, I can just do the update on it and it will take care of all the merging, provided there is no conflict, right?

Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)