Page 1 of 1
Will subversion upgrade CF from 1.60.0 to 1.70.0?
Posted: Thu Jun 28, 2012 2:06 am
by SilverNexus
I noticed that version 1.70.0 has been released, and was wondering if I could use subversion to upgrade to the newer version without having to redownload all the files, since my internet connection is mediocre at best.
Posted: Thu Jun 28, 2012 6:07 pm
by Leaf
How did you download v 1.60.0 ?
Was it from the tags direcory?
(.e., svn co
https://crossfire.svn.sourceforge.net/s ... ags/1.60.0 )
If so, then you'll need to use the command
svn --relocate to change that URL to 1.70.0 or to change it to trunk if you want the latest (almost daily) changes.
More info can be found at:
http://wiki.metalforge.net/doku.php/cro ... e#download
EDIT: if you use the --relocate command, you will only download the changes; not all the files.
Posted: Fri Jun 29, 2012 2:34 am
by SilverNexus
According to svn, I am using tags/1.60.0.
When I used
Code: Select all
svn switch --relocate tags/1.60.0 trunk
and checked the info again, it still said the URL was tags/1.60.0.
Was I doing something wrong? Or was my computer diabolically planning to drive me insane?
Posted: Fri Jun 29, 2012 10:12 pm
by Leaf
Need to use the entire URL with the switch command.
Code: Select all
svn switch --relocate https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/tags/1.70.0
Posted: Fri Jun 29, 2012 10:44 pm
by SilverNexus
Okay, I tried that command directly, and svn told me
Code: Select all
svn: Try 'svn help' for more info
svn: Not enough arguments provided
Then, I tried
Code: Select all
svn switch --relocate https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/tags/1.60.0 https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/tags/1.70.0
since the usage (according to my svn) is
Code: Select all
usage: 1. switch URL[@PEGREV] [PATH]
2. switch --relocate FROM TO [PATH...]
Svn came back with
Code: Select all
svn: Relocate can only change the repository part of an URL
I think I'm still doing something wrong...
EDIT: I tried
Code: Select all
svn switch --relocate tags/1.60.0 trunk https://crossfire.svn.sourceforge.net/svnroot/crossfire/server
utilizing the usage information above.
In turn, svn replied:
Code: Select all
svn: 'https://crossfire.svn.sourceforge.net/svnroot/crossfire' is not a working copy
Then, I tried
Code: Select all
svn switch --relocate tags/1.60.0 trunk server
Svn replied with no information, but when I checked the info, it told me
Code: Select all
Path: .
URL: https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/tags/1.60.0
Repository Root: https://crossfire.svn.sourceforge.net/svnroot/crossfire
Repository UUID: 282e977c-c81d-0410-88c4-b93c2d0d6712
Revision: 18309
Node Kind: directory
Schedule: normal
Last Changed Author: mwedel
Last Changed Rev: 14266
Last Changed Date: 2011-01-30 00:04:46 -0500 (Sun, 30 Jan 2011)
Then, in a last ditch effort to try to get this to work, I tried
Code: Select all
svn switch --relocate server/tags/1.60.0 server/trunk
Svn said nothing, but when I checked info again, it gave me the exact same information as two code boxes above.
I just don't know any more. Could I be on trunk somehow, but my svn thinks I'm not? Or could trunk somehow still have the version number as 1.60.0?
Or, perhaps the most likely, is my svn repository messed up (it once ran on my computer when a fan was installed backward)?
Posted: Fri Jun 29, 2012 10:56 pm
by Leaf
Need to update the URL for each directory (archetypes, server, client, maps) one at a time.
cd to your server directory and then enter:
Code: Select all
svn switch https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/tags/1.70.0 .
cd to your archetype directory and then enter:
Code: Select all
svn switch https://crossfire.svn.sourceforge.net/svnroot/crossfire/arch/tags/1.70.0 .
For maps, cd to that directory and enter:
Code: Select all
svn switch https://crossfire.svn.sourceforge.net/svnroot/crossfire/maps/tags/1.70.0 .
And so on.
Posted: Fri Jun 29, 2012 11:27 pm
by SilverNexus
Thank you. It finally worked.
And, on top of that, it gave the me information I so described it not giving in another post (about time...).
Another question, more related to other stuff I've had happen that others have not been able to recreate: since I was on r18309 in tags/1.60.0, should I have had easily over a hundred changes when I switched to trunk, which has r18310?
Posted: Sun Jul 01, 2012 9:27 am
by Ryo
Hello.
Unless I'm mistaking, relocating will get all changes, so it should be the latest commit you're using.
If you're planning on contributing (instead of "merely" playing), I would suggest to use the trunk instead of 1.70 branch. Trunk is where most commits happen, 1.70 only gets some bugfixes.
The code to switch (server) is probably:
Code: Select all
svn switch https://crossfire.svn.sourceforge.net/svnroot/crossfire/server/trunk .
and you need to switch arch/maps/client too.
Posted: Sun Jul 01, 2012 2:11 pm
by SilverNexus
Yeah, I noticed some bugs I had encountered were old and fixed bugs, so I did do trunk, since the only difference is the end file as far as syntax is concerned, I just changed the tags/1.70.0 folder to trunk in what I tried.
And I did switch all four pieces, but its good that you made sure.