merge

SSCM Migrate

Fernando Cremer talks about Surround SCM on November 11, 2009

Works with Surround SCM 2010 and later

Will not work with Surround SCM 2009 and earlier

SSCMigrate is a sample tool that copies a branch into a new mainline. It can be any branch, however, only that branch is migrated. Any child branch will not be migrated. This is a sample tool and it is not a finished product by any means.

Depending on your needs, this may give you a good starting point.
Continue reading…

Share on Technorati . del.icio.us . Digg . Reddit . Slashdot . Facebook . StumbleUpon

No Comments

Tags: , ,

MergeByDefect

Fernando Cremer talks about Surround SCM on November 10, 2009

Works with Surround SCM 2010 and later

Will not work with Surround SCM 2009 and earlier

MergeByDefect is an application that takes advantage of Surround SCM’s plugin architecture and API to give the user a tool to merge changes related to a TestTrack defect with the same file on another branch.

This application was originally posted as SSCM Bug Merge, which required a lot of manual input. MergeByDefect takes advantage of environment variables made available through the plugin architecture and the Surround SCM API to eliminate manual input.
Continue reading…

Share on Technorati . del.icio.us . Digg . Reddit . Slashdot . Facebook . StumbleUpon

No Comments

Tags: , , , ,

Here are a couple of tools I plug-in into Surround SCM to make my life a little easier.

WinMerge & Surround SCM

Surround SCM ships with Guiffy, a really nice cross platform diff/merge tool.  Here is a good KB article about using Guiffy. While Guiffy is a great tool, I’ve always been a WinMerge guy, it’s what I’m comfortable with and we all know merging can be scary.
Continue reading…

Share on Technorati . del.icio.us . Digg . Reddit . Slashdot . Facebook . StumbleUpon

No Comments

Tags: , ,

Surround SCM’s merge logic (which usually allows auto-merging of files without requiring the user to manually merge files) used in promoting must always promote the “tip” version of the files, this is the latest version of the files.

In some occasions the version of the file that the needs to be promoted may not always be the “tip” version.

The following article will show how you can take a specific set of files and a specific version and merge them into another branch.
Continue reading…

Share on Technorati . del.icio.us . Digg . Reddit . Slashdot . Facebook . StumbleUpon

No Comments

Tags: , , , ,

SSCM Bug Merge

Pat Burma talks about Surround SCM, TestTrack Pro on March 05, 2007

SSCMBugMerge is a C# utility that allows users to perform specific delta merge operations from one Surround SCM branch to another using a TestTrack defect number. This program is intended to serve as an example of how similar applications can be written and is not intended for use in a production environment as-is.
Continue reading…

Share on Technorati . del.icio.us . Digg . Reddit . Slashdot . Facebook . StumbleUpon

1 Comment

Tags: , , , ,