1. This site uses cookies. By continuing to use this site, you are agreeing to our use of cookies. Learn More.

Teach

Discussion in 'Looking For Help' started by hutpat, Oct 31, 2013.

  1. hutpat
    Offline

    hutpat Member

    Joined:
    Oct 24, 2013
    Messages:
    39
    Likes Received:
    0
    Teach: let's say I downloaded the publication of 54. Launched and I had people play. Suddenly the publication is 55. The question is how do I upgrade from 54 to 55 that would not hurt my players?
     
  2. Ravenwolfe
    Offline

    Moderator ServUO Developer

    Joined:
    Sep 7, 2013
    Messages:
    1,155
    Likes Received:
    125
    I'm not sure if this is the best method, but what I do is download the new one, paying attention to which files have been changed in the new publish. I also keep a listing of any scripts that I have edited. Then I use WinMerge and move any new scripts over, overwrite any scripts that have been changed but that I have never edited, and then lastly manually look at each script that has changed in the new publish and that I have edited and make the edits by hand.

    I've always suspected there is a better way, but I don't know it!
     
    • Like Like x 1
  3. m309
    Offline

    Admin Moderator ServUO Developer

    Joined:
    Mar 3, 2013
    Messages:
    1,243
    Likes Received:
    130
    Ravenwolfe, you can actually commit a local version of your own server via Git so that when you pull a new version it doesn't overwrite any of your custom changes, yet it pulls in all of the updates released. Using WinMerge (or Beyond Compare which is better imho) would to me, be the second best way to go about it.
     
    • Like Like x 2
  4. Ravenwolfe
    Offline

    Moderator ServUO Developer

    Joined:
    Sep 7, 2013
    Messages:
    1,155
    Likes Received:
    125
    Awesome info!

    Where do you commit your local version? You have to set your own fork from the main ServUO?

    Do you have to tell it which ones you have custom changed?

    How does it handle the files that have changed in the update but that you have custom edits to? Does it flag them and you manually merge or what?
     
  5. m309
    Offline

    Admin Moderator ServUO Developer

    Joined:
    Mar 3, 2013
    Messages:
    1,243
    Likes Received:
    130
    Mine simply works by right clicking the folder location where I pull to and there should be an option that pops up called "Git Extensions", if you highlight that there are quite a few options. If you select "Commit", it commits all of your custom changes to your local version. Then you can simply do the same again, and select "Pull" and it will retrieve the most recent version and won't overwrite your changes.

    It should allow you to manually merge updates into files you have customized, yes. If you installed KDiff (I think its a standard part of the Git install, though I can't remember - it's been a while since I installed) then you can actually use that to merge, sort of like WinMerge/Beyond Compare.

    Insanity, or maybe Vorspire, might have a better way or idea..but this has worked for me thusfar.
     
    • Two Thumbs Up Two Thumbs Up x 1
    • Helpful Helpful x 1
  6. hutpat
    Offline

    hutpat Member

    Joined:
    Oct 24, 2013
    Messages:
    39
    Likes Received:
    0
    Clearly easier to do everything by hand all the updates :)
     
  7. Rochaven
    Offline

    Rochaven Member

    Joined:
    Jan 21, 2014
    Messages:
    162
    Likes Received:
    1
    Is there a Git tutorial, i really want to learn how to use Git for just this kind of thing. Example being, how do you "pull" your shard to a file that can be "patched" by say Pub55 ? So much to learn, just need a solid starting point to learn it, thanks for any help
     
  8. Milva
    Offline

    Admin Moderator

    Joined:
    Mar 3, 2013
    Messages:
    3,637
    Likes Received:
    398
    I'm sure there will be once we have the Wiki up :) Have you read the post by m309 just posted above, might help out some?
     
Similar Threads: Teach
Forum Title Date
General Discussion Self-Teach Yourself How To Program! Mar 25, 2017
Tutorials HowToMake Talking NPCs with Titles Who can Teach May 26, 2015
Looking For Help Looking for someone to teach me C# Feb 20, 2015