Friday, October 10, 2008

Use DiffMerge for Compare/Merge in StarTeam

In my current company we are using StarTeam as the source control choice, I wouldn't classify it as a great source control tool but certainly better then Visual Source Safe (VSS) and PVCS Version Control that I have been using in my previous companies.

One of the best thing StarTeam offers is the ability to integrate third party file comparison/merge tools to be used from within StarTeam. I have been using Winmerge for some time as the choice of tool for Merge/Difference comparison. Refer to Jon Galloway's blog for good reference on Integrating WinMerge with StarTeam.

I have recently started using DiffMerge as the tool of choice for doing Comparison/Merging from within StarTeam. Please follow the steps mentioned below to use DiffMerge for comparison/merge from within StarTeam.

1. GoTo "Tools" Menu -> "Personal Options" SubMenu
2. GoTo "File" Tab
3. Click on "Alternate Applications"
4. Setting DiffMerge as External Application for Merge
a. In Merge Utility -> Give the name of the path where DiffMerge.Exe is located.
b. Options -> /r=$resultfile $usertip $basefile $branchtip /t1="Local Version" /t2="Merged File" /t3="StarTeam Version"

5. Setting DiffMerge as External Application for Comparison
a. In Comparison Utility -> Give the name of the path where DiffMerge.Exe is located.
b. Options -> $file1 $file2 /t1="StarTeam Version" /t2="Local Version"

Now you can start using DiffMerge from within StarTeam


dac said...

I've tried this, and it seems to work, except that when I save the merged results, it doesn't actually get back into StarTeam, it ends up as a file written to disk called $resultfile. Is there something in DiffMerge I need to set?

Armel said...

@dac maybe try /r $resultfile without the '=' (many tools will accept both notations) and maybe /r=$resultfile is understood as a whole by StarTeam and thus not transformed to /r=myresultfile.txt

Anonymous said...

Good call Armel; I had the same issue and that fixed it.

Anonymous said...

Keep working ,great job!

Anonymous said...

Well I to but I dream the brief should prepare more info then it has.

Anonymous said...

Your blog keeps getting better and better! Your older articles are not as good as newer ones you have a lot more creativity and originality now keep it up!

Anonymous said...

Hello everyone! Who knows where to upload the film Avatar?
I even bought the film Avatar for a SMS to , the link was, but download fails, the system will boot quite strange cocoa something.
Men, advise where to normal as quickly download film avatar?

Anonymous said...

[url=][b]rtl wetter[/b][/url]

[url=][b]wetter prognose[b][/url]

Anonymous said...

[url=]alle wetter[/url]

[url=]wetter deutschland de[/url]

Anonymous said...

Anonymous said...

I sell a boat-program which will help you to outwit auction and to win, initially the boat was created for the Scandinavian auction but now the program can work with similar auctions: gagen ru, vezetmne ru and with ten.
The program-boat stakes for you, i.e. for this purpose it is not necessary to sit constantly at the monitor. The boat can set time when it is necessary to stake, thus you as much as possible will lower expenses for rates, and as much as possible increase the chances of a victory.

The price of the program a boat for the Scandinavian auctions 20$

For the first 10 clients the price 15$

To all clients free updating and support.

Behind purchases I ask in icq: 588889590 Max.

Anonymous said...

[b]Set software LoveBots v 5.2[/b]

All for a mass mailing dating

The script is written in php5


[i]registration, account activation
manual input captures, or the solution through antikapchu
filling data accounts:
- Gulf desired photo
- Инфы about yourself
- Diary
- Sexual preference[/i]

gulyalka on questionnaires spammer on lichku
- Randomization Posts: replacement of Russian letters in Latin analogues

optimized to work in a continuous loop
check-activation-filling-spam check ..

Updates and support free of charge.

Price per set 100 wmz

For the first 10 buyers price 70 wmz (your feedback on the software).

For shopping I ask in icq: 588889590 Max.

Scrin program:




Flooding in the subject no! Write to feedback after the purchase.

Anonymous said...

hey your blog design is very nice, neat and fresh and with updated content, make people feel peace and I always like browsing your site.

- Norman

Anonymous said...

In no way quit a medicine by yourself. A lot of people will start a new medicine when they are experiencing lower then instantly stop taking it when they are sensation better. This can be a awful idea as it can really make you feel worse than you probably did at first. Generally consult a doctor just before preventing. [url=]T22wyuul[/url]

Anonymous said...

As presently identified, hair thinning can be disastrous to some person's self-image. Lots of people turn to outlandish methods trying to regrow your hair or could design their hair within a manner to try to hide the obvious fact. By using the information and guidance in the following paragraphs you can find a method that will work for you and aid restore your self-confidence.Deal with The Hair Effectively Using These Superb Good Hair Care Ideas [url=]Obse8ighve[/url]

Anonymous said...

Pay attention! Examine everything you are putting your signature on when dealing with an insurance claim as well as your insurance company. Some organizations will try to fall in the release of liability even if you have pending issues open. If you indication it, you've just waived your ability to keep working for a resolution to any exceptional promises. Ca45yhhe