Blog Documentation Book a Demo
Vanilla 1 is no longer supported or maintained. If you need a copy, you can get it here.
HackerOne users: Testing against this community violates our program's Terms of Service and will result in your bounty being denied.

SVN for dummies?

iternityiternity
edited April 2007 in Vanilla 1.0 Help
Hello I have searched the Discussions and looked into the Wiki with no real success. Is there a step by step instruction how to maintain an auto update keeping my changes to the files using SVN? Or do I get this wrong?

Comments

  • Max_BMax_B New
    You must set up your own SVN repository, with a vendor branch reflecting Lussumo state, and the main being your setup. Then you'll have to merge vendor branch to yours when needed.
  • TomTesterTomTester New
    edited March 2007
    Wow, Max, I'm happy to find out that I'm even more stupid than a dummy! ;-)
  • MarkMark Vanilla Staff
    edited March 2007
    Once you have svn installed on your server (you'll have to get instructions on that from the svn book or something), you can check out Vanilla like this:

    svn checkout http://lussumo.com/svn/vanilla/trunk /path/to/my/vanilla/folder
    Then you can use the following command to periodically get the latest files:

    svn update
    Keep in mind that by doing this, you will be using the most recent updates and changes to the core - and there may be bugs in them.
  • iternityiternity
    edited March 2007
    Mark, thank you for your Info, helps me a lot. Using the SVN, my changes to some files will be overwritten or (magically) kept?
  • MarkMark Vanilla Staff
    edited March 2007
    If you make changes to core files, svn won't allow them to be overwritten. But you won't be able to commit your changes to the lussumo server, either (because I keep a tight leash on who has the ability to do so).

    Most of the changes people make aren't to the core - which is what you want. Anything in the conf or extensions directories can be altered without any problems or worries of being overwritten by svn.
  • Max_BMax_B New
    @iternity: your original question is clearly depicted in the svn manual at the "vendor branches" chapter.
  • DinoboffDinoboff
    Thanks Max_B, that will make things easier :-)
    Do you know how to do that tortoiseSVN?
  • DinoboffDinoboff
    By doing that, I mean the merging part, creating the vendor brange is ok (and it is great). But I don't know how to do the merging part with tortoiseSVN:svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \ http://svn.example.com/repos/vendor/libcomplex/current \ libcomplex
  • Max_BMax_B New
    Is this helping you ?
    svn_load_dirs.pl file:///path to vendor branch/Vanilla/current Vanilla.1.1.2 #cd to the Vanilla folder in your main branch working copy svn merge -r 86:HEAD file:///path to vendor branch/Vanilla/current
    I know nothing about Totroise (PC stuff? I'm a *nix guy, os X currently) but it should use the same commands.
  • DinoboffDinoboff
    edited March 2007
    oops, I should have remembered.
    The command are the same, I think, it just I would like to be able to do without having to open a console.
  • Max_BMax_B New
    Without a CL, I bet you can't. I'm using svnX under osX, and, as most of GUI front end, it does not go beyond basic steps.
  • chuyskywalkerchuyskywalker
    Mark, you may want to consider keeping a tag of the most stable version of Vanilla around. For example, you have tagged 1.1, 1.1.1, 1.1.2, etc. However, perhaps there should be a 1.x-stable which simply is always fed from the most recent 1.x stable build. You could also have a "latest-stable" branch -- but large version jumps tend to need more than just a `svn up` to properly execute.
This discussion has been closed.