Does anyone know the correct command line to integrate DiffMerge with StarTeam?
StarTeam allows launching of a merge utility, and you can pass a command line with the following substitution parameters:
$branchtip - branch tip revision
$usertip - local user file
$basefile - common ancestor of $branchtip and $usertip
$resultfile - the merged file
StarTeam Merge Integration
Moderator: SourceGear
In our Diff Merge documentation, if you look for the command line documentation in the Windows help file, it will list the parameters there.
-
jeffhostetler
- Posts: 534
- Joined: Tue Jun 05, 2007 11:37 am
- Location: SourceGear
- Contact:
Try this
I've not used StarTeam, but based upon your post, I'll suggest that you try this:
/r=$resultfile /m $usertip $basefile $branchtip
If I understand their meaning, this will put your local user file in the left panel, the common ancestor in the center (for merging into), and the branch tip in the right panel. the merge result will be written to the result file.
the /m tells DiffMerge to run auto-merge immediately after starting up.
If you want, you can also prepend the following to the command line:
/t1="user local file" /t2="common ancestor" /t3="branch tip"
this will put descriptive labels above each file panel instead of whatever (presumably) temp file names it uses.
Hope this helps. Let me know if this works for you or if you have any other questions or problems.
j
/r=$resultfile /m $usertip $basefile $branchtip
If I understand their meaning, this will put your local user file in the left panel, the common ancestor in the center (for merging into), and the branch tip in the right panel. the merge result will be written to the result file.
the /m tells DiffMerge to run auto-merge immediately after starting up.
If you want, you can also prepend the following to the command line:
/t1="user local file" /t2="common ancestor" /t3="branch tip"
this will put descriptive labels above each file panel instead of whatever (presumably) temp file names it uses.
Hope this helps. Let me know if this works for you or if you have any other questions or problems.
j