Revisions

Welcome in the osRose emulator Project.

Moderators: osRose dev team, ospRose dev team, osiRose dev team, Moderators

Re: Revisions

Postby Drakia on Tue Jun 03, 2008 9:21 pm

Don't worry about it, rev numbers don't matter, hell, KDE goes through 300 revisions a day, minimum ;)
My favorite skill is scaring new users away.
If you haven't SEARCHED expect me to yell at you.
Image
Drakia
ospRose dev team
ospRose dev team
 
Posts: 1614
Joined: Tue Sep 18, 2007 6:53 am
Location: Nanaimo, BC, Canada

Re: Revisions

Postby PurpleYouko on Tue Jun 03, 2008 9:27 pm

it just takes so bloody long to download the new revs and compare the code each time.
Particularly when you are using a special rev with your own custom testing code in it. Stuff that you don't really need to go public with because it is only temporary anyway, but you don't want to be overwritten.

I don't entirely trust the merge functions to get it right yet.
I'm a bit of a noob with SVN. ;)
Need to lookup information on NARose items, skills, quests?
Now featuring a newly completed skill tree for all classes
Formatting fixed for different resolutions
Image

"A Gazelle is nothing but a giraffe plotted logarithmicaly"
User avatar
PurpleYouko
Rose Guru
Rose Guru
 
Posts: 4733
Joined: Fri Aug 10, 2007 2:05 pm

Re: Revisions

Postby Drakia on Tue Jun 03, 2008 9:31 pm

Well, I always keep my SVN directory clean until I'm ready to commit, just create a new directory to work in, and use WinMerge to copy any new SVN changes over ;)
My favorite skill is scaring new users away.
If you haven't SEARCHED expect me to yell at you.
Image
Drakia
ospRose dev team
ospRose dev team
 
Posts: 1614
Joined: Tue Sep 18, 2007 6:53 am
Location: Nanaimo, BC, Canada

Re: Revisions

Postby PurpleYouko on Tue Jun 03, 2008 9:44 pm

That's pretty much the way i do it.
I use notepad++ to compare files though. Does a pretty decent job of side by side comparissons
Need to lookup information on NARose items, skills, quests?
Now featuring a newly completed skill tree for all classes
Formatting fixed for different resolutions
Image

"A Gazelle is nothing but a giraffe plotted logarithmicaly"
User avatar
PurpleYouko
Rose Guru
Rose Guru
 
Posts: 4733
Joined: Fri Aug 10, 2007 2:05 pm

Re: Revisions

Postby Drakia on Tue Jun 03, 2008 9:47 pm

Well, I like WinMerge cause it can do directory-wide comparison, I have it setup to compare only .cpp and .h files in my SVN and Compile directories.
My favorite skill is scaring new users away.
If you haven't SEARCHED expect me to yell at you.
Image
Drakia
ospRose dev team
ospRose dev team
 
Posts: 1614
Joined: Tue Sep 18, 2007 6:53 am
Location: Nanaimo, BC, Canada

Re: Revisions

Postby PurpleYouko on Tue Jun 03, 2008 9:49 pm

Maybe i will give that a try. might be a lot quicker.
Need to lookup information on NARose items, skills, quests?
Now featuring a newly completed skill tree for all classes
Formatting fixed for different resolutions
Image

"A Gazelle is nothing but a giraffe plotted logarithmicaly"
User avatar
PurpleYouko
Rose Guru
Rose Guru
 
Posts: 4733
Joined: Fri Aug 10, 2007 2:05 pm

Re: Revisions

Postby Drakia on Tue Jun 03, 2008 9:54 pm

If you do, here's my filter for .cpp and .h files only :) (Extract it to the "Filters" folder and then select it as a filter when loading directories)
Attachments
CppH.rar
(369 Bytes) Downloaded 536 times
My favorite skill is scaring new users away.
If you haven't SEARCHED expect me to yell at you.
Image
Drakia
ospRose dev team
ospRose dev team
 
Posts: 1614
Joined: Tue Sep 18, 2007 6:53 am
Location: Nanaimo, BC, Canada

Re: Revisions

Postby Maxxon on Tue Jun 03, 2008 10:48 pm

PurpleYouko wrote:I don't entirely trust the merge functions to get it right yet.
I'm a bit of a noob with SVN. ;)


Give it a try :) As long as you only hit update it will merge the SVN Changes into your files. Of course changes you made wont get overwritten. But it may require you to resolve some conflicts manually. The only thing that can be a bit annoying is, when someone breaks something and you are testing something locally it make break your testing and you think then its your fault.
But if you only Update your local copy and only commit to the SVN when you are sure it works, the SVN should be pretty much "stable".
At work this works pretty well. It happens almost never that someone commits crap. Okay, if you commit crap you need to give out some beer for all. Thats a nice motivation to not commit crap :)
Image
an anymous comment on a program called reloader:
what if a fatal error happens, will it restart it?
User avatar
Maxxon
Hawker's pet
Hawker's pet
 
Posts: 1305
Joined: Sat Nov 10, 2007 12:42 pm

Re: Revisions

Postby PurpleYouko on Wed Jun 04, 2008 6:47 pm

Can't install win merge. It requires that i be logged in as an admin on this computer.

Looks like I'm stuck with the method I'm using.

Drakia..
Couple of questions about the revs.
1) what difficulty are you having with compiling my xprate stuff?
2) why did you need to add xprate to the charinfo structure rather than use the existing version in the stats structure? Were you getting problems with it in stats?

Or was the stuff simply not committed in the first place?
I'm getting SVN updates coming through with functions doubled up. :(
Need to lookup information on NARose items, skills, quests?
Now featuring a newly completed skill tree for all classes
Formatting fixed for different resolutions
Image

"A Gazelle is nothing but a giraffe plotted logarithmicaly"
User avatar
PurpleYouko
Rose Guru
Rose Guru
 
Posts: 4733
Joined: Fri Aug 10, 2007 2:05 pm

Re: Revisions

Postby Drakia on Wed Jun 04, 2008 7:05 pm

http://portableapps.com/apps/utilities/ ... e_portable <-- no install required ;)

And yeah, I couldn't compile the rev you put up, complained about xprate not being defined, you had added it to "INFO" but it needed to be part of "STATS" ;) (I didn't remove the one in INFO, cause I didn't see it)
My favorite skill is scaring new users away.
If you haven't SEARCHED expect me to yell at you.
Image
Drakia
ospRose dev team
ospRose dev team
 
Posts: 1614
Joined: Tue Sep 18, 2007 6:53 am
Location: Nanaimo, BC, Canada

PreviousNext

Return to Support - OspRose Emulator

Who is online

Users browsing this forum: No registered users and 7 guests

cron