[tip] Use WinMerge for compare / merge in StarTeam - Jon Galloway

[tip] Use WinMerge for compare / merge in StarTeam

We use StarTeam for source control at my work. I'm not a huge StarTeam fan, and I think the compare / merge portion is pretty much unusable. Fortunately, you can pick your own alternative merge and compare utilities. I like WinMerge . Here's how to set it up:

1. Tools / Options / File tab.
2. Check "Merge utility" and "Comparison utility" checkboxes.
3. Browse to WinMergeU.exe
4. Enter the following for merge utility options: /dl "StarTeam Version" /dr "Your Changes" $branchtip $usertip $resultfile
5. Enter the following for comparison utility options: /dl "StarTeam or Older Version" /dr "Your Changes or Newer Version" $file1 $file2

References:
WinMerge command line info: http://winmerge.sourceforge.net/2.2/manual/commandline.html
Araxis Merge integration info for various source control systems: http://www.araxis.com/merge/scm_integration.html

powered by IMHO 1.2

Published Saturday, January 22, 2005 7:12 AM by Jon Galloway
Filed under:

Comments

# re: [tip] Use WinMerge for compare / merge in StarTeam

Been using StarTeam since last summer, I also frequently use WinMerge.

A colleague today told me about the Alternative Applications options in StarTeam and a google lead me to your page.

Wish I knew about this option before now! Thanks a lot for the excellent tip.

Thursday, March 22, 2007 12:44 PM by boardtc

# re: [tip] Use WinMerge for compare / merge in StarTeam

Thanx a lot for the tip on WinMerge with ST.

/Fredrik

Friday, March 23, 2007 6:07 AM by Fredrik

# re: [tip] Use WinMerge for compare / merge in StarTeam

Here's a possible improvement to your tip, which allows saving changes to the compared files.

merge utility options:

/dl $file1 /dr $file2 $branchtip $usertip $resultfile

comparison utility options:

/dl $file1 /dr $file2 $file1 $file2

Thanks a lot,

Dave

[fjdave@email.it]

Tuesday, November 27, 2007 5:56 AM by dave81

# re: [tip] Use WinMerge for compare / merge in StarTeam

in response to Daves tip,

it doesnt work quite as well when comparing two historical files as they are both shown as temp files and its hard to know which is which.

Tuesday, January 15, 2008 2:15 PM by Duncan

# re: [tip] Use WinMerge for compare / merge in StarTeam

Thanks, this worked well for me.

"Then why use it at all?

Monday, January 19, 2009 10:39 AM by Bertrand Russell"

Because most development teams have paid a hefty price to use it even if they have decided afer the fact that they don't like it. Or perhaps your team lead or the haed of your department was the one who instilled it as the tool of choice. Furthermore if there are users who are external to the dev team who use it to track CR's, manage specifications, reporting...etc. It would look pretty bad if this expensive tool was abandoned and replaced with something like say SVN.

Would you like to be the guy who reported to management as to why the company spent $xxxx.xx for StarTeam and why it wasn't being used?

Monday, January 26, 2009 2:51 PM by mako

# re: [tip] Use WinMerge for compare / merge in StarTeam

Does anyone have a list of $variables that can be used in the call to the alternate application? For instance, when I am comparing two revisions of the same file and I use this:

/dl $file1 /dr $file2 $file1 $file2

Winmerge opens up with the specific temp file names as the title of each file revision. Starteam seems to generate these file names sequentially for each time the compare utility is called, so you end up getting File1.i and File2.i on the first call to winmerge, then you can compare the exact same files a second time and it will show up as File3.i and File4.i.

What I would really like is to be able to pass in the Branch Revision/Dot Notation number for the files being compared so that I can actually tell what files are being compared while I'm in Winmerge.

This used to work fine in previous versions of starteam, but starteam 2008 seems to have changed the way that it generates the temporary files for comparison so that the file names are now meaningless.

Thanks for any help.

Wednesday, March 4, 2009 1:55 PM by doug

# re: [tip] Use WinMerge for compare / merge in StarTeam

doug - I too would like this info...

Tuesday, March 17, 2009 12:34 PM by harry

# re: [tip] Use WinMerge for compare / merge in StarTeam

Variables $title1 and $title2 return the actual filename and it's version. So for file comparison you could do like:

/dl $title1 /dr $title2 $file1 $file2

It worked in StarTeam 2006, not sure about other versions.

Wednesday, March 18, 2009 1:53 AM by desibaba

# re: [tip] Use WinMerge for compare / merge in StarTeam

Yes! Finally someone writes about sildenafil citrate.

of Seattle (the developer of the vaccine) has begun another study on

98 men with advanced prostate cancer and so far the results seem to be

confirming the discovery, said Mitchell H. The causes for this problem may be any, ranging from psychological to physical factors.

Saturday, September 29, 2012 2:23 PM by Stearns

# re: [tip] Use WinMerge for compare / merge in StarTeam

This is really interesting, You are an excessively professional blogger.

I've joined your feed and look forward to looking for more of your fantastic post. Additionally, I've shared

your web site in my social networks

Wednesday, February 6, 2013 11:20 AM by Howe

# re: [tip] Use WinMerge for compare / merge in StarTeam

Pretty part of content. I just stumbled upon your blog and in accession

capital to say that I get actually enjoyed account your blog posts.

Any way I will be subscribing on your feeds and even I success you access persistently fast.

Thursday, February 7, 2013 7:57 AM by Latham

# re: [tip] Use WinMerge for compare / merge in StarTeam

I love the efforts you have put in this, thankyou for all the great articles.

Monday, April 1, 2013 12:29 PM by ejbxtas@yahoo.co.uk

# re: [tip] Use WinMerge for compare / merge in StarTeam

Hi there, this weekend is good in favor of me, as this time i am reading this great

informative post here at my home.

Sunday, May 12, 2013 5:40 PM by Hudspeth