Author Topic: Working on a script with multiple people/versions? BeyondCompare!  (Read 7456 times)

0 Members and 1 Guest are viewing this topic.

Offline CoraginTopic starter

  • Wacko in Pajama's
  • Elite
  • *
  • *
  • Posts: 1641
  • Activity:
    0%
  • Reputation Power: 23
  • Coragin might someday be someone...Coragin might someday be someone...Coragin might someday be someone...Coragin might someday be someone...
  • Gender: Male
  • It Is What It Is.
  • Respect: +57
  • Referrals: 1
    • View Profile
0
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
Coragin

My Facebook
And now I'm better at doing what ever it is Wolverine does!

Offline TrailMyx

  • Officially retired from UO
  • Administrator
  • *
  • *
  • Posts: 13303
  • Activity:
    0.4%
  • Reputation Power: 154
  • TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!
  • Gender: Male
  • Viper!
  • Respect: +1349
  • Referrals: 33
    • View Profile
    • ScriptUO
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #1 on: January 25, 2010, 05:19:01 AM »
0
Don't forget that ScriptUO with TortoiseSVN does this as well.
Please read the ScriptUO site RULES
Come play RIFT with me!

Offline 12TimesOver

  • Another Day, Another Vendetta
  • Global Moderator
  • *
  • *
  • Posts: 3694
  • Activity:
    0%
  • Reputation Power: 41
  • 12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.
  • Gender: Male
  • Respect: +321
  • Referrals: 2
    • View Profile
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #2 on: January 25, 2010, 05:28:25 AM »
0
As does Notepad++
When they come for me I'll be sitting at my desk
     with a gun in my hand wearing a bulletproof vest
My, my, my how the time does fly
     when you know you're gonna die by the end of the night

Offline UOMaddog

  • Maddog
  • Elite
  • *
  • *
  • Posts: 1625
  • Activity:
    0%
  • Reputation Power: 22
  • UOMaddog might someday be someone...UOMaddog might someday be someone...UOMaddog might someday be someone...UOMaddog might someday be someone...
  • Gender: Male
  • Biggest B@D@$$ of the Universe
  • Respect: +165
  • Referrals: 8
    • View Profile
    • Insane UO
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #3 on: January 25, 2010, 05:34:31 AM »
0
I'll add in my vote for Notepad++ since I love it so much!
There are 10 kinds of people in this world: those that understand binary and those that don't!

Windows:  A 64-bit tweak of a 32-bit extension to a 16-bit user interface for an 8-bit operating system based on a 4-bit architecture from a 2-bit company that can't stand 1 bit of competition!

Offline CoraginTopic starter

  • Wacko in Pajama's
  • Elite
  • *
  • *
  • Posts: 1641
  • Activity:
    0%
  • Reputation Power: 23
  • Coragin might someday be someone...Coragin might someday be someone...Coragin might someday be someone...Coragin might someday be someone...
  • Gender: Male
  • It Is What It Is.
  • Respect: +57
  • Referrals: 1
    • View Profile
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #4 on: January 25, 2010, 07:24:45 AM »
0
DONT HIJACK MY THREAD!!!!  BEYONDCOMPARE FTW!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!11111oneoneone

:D
Coragin

My Facebook
And now I'm better at doing what ever it is Wolverine does!

Scrripty

  • Guest
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #5 on: January 25, 2010, 08:11:26 AM »
0
Don't forget that ScriptUO with TortoiseSVN does this as well.

What?  Please elaborate.

Offline Cerveza

  • Hacksimus Maximus
  • Scripthack
  • *
  • Posts: 5857
  • Activity:
    0%
  • Reputation Power: 80
  • Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!
  • Gender: Male
  • So... Hows that Hopey-Changey thing working out?
  • Respect: +403
  • Referrals: 11
    • View Profile
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #6 on: January 25, 2010, 08:15:05 AM »
0
I like ExamDif

Especially since that Beyond Compare is 30 Day.
XXXXXXXXXX________________________________________] 20%
I've forgotten more about this game then most people will ever know.
Thank you for controlling your children. Their manners reflect your love for them.
Give a man a fish and you feed him for a day. Don't teach a man to fish, and you feed yourself. He's a grown man. Fishing's not that hard.

Scrripty

  • Guest
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #7 on: January 25, 2010, 08:27:17 AM »
0
I like ExamDif

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)).

Offline Cerveza

  • Hacksimus Maximus
  • Scripthack
  • *
  • Posts: 5857
  • Activity:
    0%
  • Reputation Power: 80
  • Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!Cerveza is awe-inspiring!
  • Gender: Male
  • So... Hows that Hopey-Changey thing working out?
  • Respect: +403
  • Referrals: 11
    • View Profile
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #8 on: January 25, 2010, 08:36:49 AM »
0
He's a tortoise lover.
XXXXXXXXXX________________________________________] 20%
I've forgotten more about this game then most people will ever know.
Thank you for controlling your children. Their manners reflect your love for them.
Give a man a fish and you feed him for a day. Don't teach a man to fish, and you feed yourself. He's a grown man. Fishing's not that hard.

Offline Xclio

  • Officially "The MAN"
  • Elite
  • *
  • *
  • Posts: 981
  • Activity:
    0%
  • Reputation Power: 9
  • Xclio has no influence.
  • Gender: Male
  • Respect: +56
  • Referrals: 1
    • View Profile
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #9 on: January 25, 2010, 09:01:07 AM »
0
I use notepad++ at work whenever I need to do that but have been meaning to play around with SUO and tortoise.

Scrripty

  • Guest
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #10 on: January 25, 2010, 09:09:06 AM »
0
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? :)

Offline TrailMyx

  • Officially retired from UO
  • Administrator
  • *
  • *
  • Posts: 13303
  • Activity:
    0.4%
  • Reputation Power: 154
  • TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!
  • Gender: Male
  • Viper!
  • Respect: +1349
  • Referrals: 33
    • View Profile
    • ScriptUO
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #11 on: January 25, 2010, 10:33:08 AM »
0
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.
Please read the ScriptUO site RULES
Come play RIFT with me!

Scrripty

  • Guest
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #12 on: January 25, 2010, 11:20:22 AM »
0
Is there any documentation on how TSVN works with SUO?

Offline TrailMyx

  • Officially retired from UO
  • Administrator
  • *
  • *
  • Posts: 13303
  • Activity:
    0.4%
  • Reputation Power: 154
  • TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!TrailMyx is awe-inspiring!
  • Gender: Male
  • Viper!
  • Respect: +1349
  • Referrals: 33
    • View Profile
    • ScriptUO
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #13 on: January 25, 2010, 11:22:05 AM »
0
Is there any documentation on how TSVN works with SUO?

Oh yeh, it's with all the other documentation.  ;)
Please read the ScriptUO site RULES
Come play RIFT with me!

Offline 12TimesOver

  • Another Day, Another Vendetta
  • Global Moderator
  • *
  • *
  • Posts: 3694
  • Activity:
    0%
  • Reputation Power: 41
  • 12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.12TimesOver is a force to reckon with.
  • Gender: Male
  • Respect: +321
  • Referrals: 2
    • View Profile
Re: Working on a script with multiple people/versions? BeyondCompare!
« Reply #14 on: January 25, 2010, 11:32:58 AM »
0
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.

When they come for me I'll be sitting at my desk
     with a gun in my hand wearing a bulletproof vest
My, my, my how the time does fly
     when you know you're gonna die by the end of the night

Tags: