ScriptUO

Official ScriptUO EasyUO Scripts => Scripting Chat => Topic started by: Coragin on January 25, 2010, 02:01:25 AM

Title: Working on a script with multiple people/versions? BeyondCompare!
Post by: Coragin on January 25, 2010, 02:01:25 AM
Here is a great little program, it allows you to load up two files and it will compare them side by side, line by line and will highlight the differences.  It will also show (and leave spaces in one) where new code is, what is changed just a little and allow you to copy the new code over to either side with one click.

I encourage anyone working with multiple people on the same script to download and try this out.

http://www.scootersoftware.com (http://www.scootersoftware.com)
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 05:19:01 AM
Don't forget that ScriptUO with TortoiseSVN does this as well.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: 12TimesOver on January 25, 2010, 05:28:25 AM
As does Notepad++
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: UOMaddog on January 25, 2010, 05:34:31 AM
I'll add in my vote for Notepad++ since I love it so much!
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Coragin on January 25, 2010, 07:24:45 AM
DONT HIJACK MY THREAD!!!!  BEYONDCOMPARE FTW!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!11111oneoneone

:D
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 08:11:26 AM
Don't forget that ScriptUO with TortoiseSVN does this as well.

What?  Please elaborate.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Cerveza on January 25, 2010, 08:15:05 AM
I like ExamDif (http://www.prestosoft.com/edp_examdiff.asp)

Especially since that Beyond Compare is 30 Day.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 08:27:17 AM
I like ExamDif (http://www.prestosoft.com/edp_examdiff.asp)

Especially since that Beyond Compare is 30 Day.

Maybe we can get TM to add supoort to SUO for the drag and rop and "go to line and compare" functions in ExamDif... that's SWEET.

Quote
-Easy editing of the first and second files. ExamDiff will
 spawn any editor (configurable by the user) with the first
 or second file, and line number option (available for
 editors that support this, through ExamDiff variables:
 $FILE (first or second file name), $CURDIFF (number of
 line at which the current difference starts), and
 $CARET (number of line where the caret is located)).
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Cerveza on January 25, 2010, 08:36:49 AM
He's a tortoise lover.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Xclio on January 25, 2010, 09:01:07 AM
I use notepad++ at work whenever I need to do that but have been meaning to play around with SUO and tortoise.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 09:09:06 AM
He's a tortoise lover.

Yea but he's looking into it right now anyways, wouldn't be hard to add in a check for $file and $chkdef or whatever...? :)  Or SHOULDN'T be I would think...  I'm sure supporting one standard is better, but why wouldn't a check for the variables from both be possible? :)
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 10:33:08 AM
Sounds like more work.  TortoiseSVN works for me; I use it for version control of everything I do and it integrates seamlessly into SharpDevelop.  I'm not gonna make any changes in that regard.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 11:20:22 AM
Is there any documentation on how TSVN works with SUO?
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 11:22:05 AM
Is there any documentation on how TSVN works with SUO?

Oh yeh, it's with all the other documentation.  ;)
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: 12TimesOver on January 25, 2010, 11:32:58 AM
Is there any documentation on how TSVN works with SUO?

Oh yeh, it's with all the other documentation.  ;)
It was all on a cocktail napkin from a cheezy, Glitter Gulch, penny-slot dive but someone spilled their Metropolitan on the bar and the ink ran. It's gone now.

Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 11:34:48 AM
It was all on a cocktail napkin from a cheezy, Glitter Gulch, penny-slot dive but someone spilled their Metropolitan on the bar and the ink ran. It's gone now.

lol

Is there any documentation on how TSVN works with SUO?

Is there a specific question you have? 
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 11:38:06 AM
I'm just wondering if you install TSVN and it just "works" with SUO for highlighting and compare... or what do you gotta do to get it up and running and use it fully?
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 11:54:42 AM
SUO senses to see if you TSVN installed.  So if you do, SUO will indicate this.  After that, you just select 2 files from the popup.  After that, SUO just sends the 2 filenames to TortoiseMerge so you can see the graphical diff.

Best you can do is just install TSVN and try it.  Really very simple for diffing.  Using it for SVN can be hard at first to setup, but ultimately makes version control effortless.  If you want to see the 1st version of ScriptUO, I can easily recompile.  ;)   
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 03:37:52 PM
Well if it has any of the features of the one I just used, it's my editor of choice period now. :)
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 07:10:04 PM
Well if it has any of the features of the one I just used, it's my editor of choice period now. :)


With all the features or Tortoise,  I just never needed to look for anything else.  I don't like dependencies in my code, but it was good enough for me to just differ that function to TSVN.  Plus when you get your SVN interface to boot, it's all gold.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 25, 2010, 07:31:40 PM
Yea that's SWEEEET.  SUO from now on for me. :)
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 07:32:57 PM
Yea that's SWEEEET.  SUO from now on for me. :)


Have you been able to play much with TSVN yet?
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Coragin on January 25, 2010, 08:09:24 PM
Im reporting you all to the admins for hijacking my thread!

Admins?

Hello?

Anyone?
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 25, 2010, 08:18:51 PM
Admins?

Pfffft!
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Coragin on January 25, 2010, 09:37:14 PM
lol
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 26, 2010, 02:08:15 PM
Yea that's SWEEEET.  SUO from now on for me. :)


Have you been able to play much with TSVN yet?

I played with the compare thing.  The DIFF function in SUO.  That's very nice.  Any other huge features I should know about? :)
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 26, 2010, 02:29:37 PM
There's the newly added Favorites.  If you are using the beta version, there's a file preview feature that's kinda nice.
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: Scrripty on January 26, 2010, 02:36:36 PM
There's the newly added Favorites.  If you are using the beta version, there's a file preview feature that's kinda nice.

Why can't you do a side by side compare inside SUO?  Between 2 versions of a script?  Am I missing how it works?  It opens another window, but what can I change?  How do you make changes and merge them with the original in SUO?
Title: Re: Working on a script with multiple people/versions? BeyondCompare!
Post by: TrailMyx on January 26, 2010, 06:13:59 PM
Welcome to the wonderful world of DIFF.  ;)