Toad integrates with your existing version control system so you can maintain multiple revisions of objects. See Configure Version Control for Objects for more information on configuring version control in Toad.
For Version Control of your files handled by Toad see Version Control for Toad Files.
Important: See Troubleshoot Version Control for more information about issues when upgrading version control from a previous version.
Notes:
You must install a supported version control client on the computer where Toad is installed. The following table lists the supported version control providers and the versions tested with Toad.
Supported Provider | Server Version Tested | Client Version Tested |
---|---|---|
Apache Subversion™
|
Subversion 1.7.5 on Windows |
CollabNet Subversion Command-Line Client 1.7.5 Note: Any Subversion client must have svn.exe in its installation directory to use version control in Toad. |
Git | Toad works only with the local repository. For commands such as clone, pull and push use an external tool. | |
Team Foundation Server (TFS) |
TFS 2008, 2010, 2012, 2013 |
Visual Studio® (2008, 2010, 2012, 2013) Team Explorer Client
|
File system based | Toad allows to utilize practically any version control system using the external client tool. In this case Toad Version Control tool works with the directories at local HDD while you commit changes to the repository with version control client tool. | |
Note: Toad connects to your version control system based on login information included in the configuration. Your version control client does not need to run for Toad to connect. |
Details of Team Foundation Server support:
Visual Studio/Team Explorer version | TFS 2013 support notes | TFS 2012 support notes | TFS 2010 support notes |
---|---|---|---|
Visual Studio 2015 | Supported (RTM or latest update) | Supported (RTM or latest update) | Supported (RTM or latest update) |
Visual Studio/Team Explorer 2013 | Supported (RTM or latest update) | Supported (RTM or latest update) | Supported (RTM or latest update) |
Visual Studio/Team Explorer 2012 | Requires latest Visual Studio 2012 update. Supports Git with Visual Studio Tools for Git extension | Supported (RTM or latest update). Supports Git with Visual Studio Tools for Git extension | Supported (RTM or latest update). Supports Git with Visual Studio Tools for Git extension |
Note: Additional functionality and compatibility with older clients is possible but out of scope of what we are able to test.
Toad can integrate with your existing version control system allowing you to maintain multiple versions of Toad files. After you integrate Toad with your version control system, you can perform version control tasks directly from within Toad, such as commit file changes and retrieve revisions.
Toad supports the following version control systems for managing Toad files:
The following types of files can be managed using version control from within Toad: Editor (.tef, .sql, .txt), Query Builder (.tsm), ER Diagram (.ter), and Automation (.tas).
Toad supports version control for database objects, as well as files. Version control for objects is configured separately from version control for files. For more information about version control for objects, see Configure Version Control for Objects.
To configure version control for Toad files
In Toad, open one of the supported file types. Then right-click the document window tab and select File Version Control | Version Control Wizard. This action opens the Version Control Wizard which allows you to configure Toad for your version control system.
Note: Even if you previously configured version control for objects, you must run the Version Control Wizard again to configure version control for files.
Use the wizard to provide information about your version control system to Toad. Review the following for additional information:
Field/Button | |
---|---|
Version Control System Page | |
Type |
Select Subversion. |
Properties |
Click the Properties button and enter the path to the Subversion executable (svn.exe) on the client computer. For example, if using TortoiseSVN, the path might be: C:\Program Files\TortoiseSVN\bin Note: Do not include svn.exe in the path. |
Server |
Enter the URL for the Subversion repository on the Subversion server. |
Login and Password |
Enter the user name and password for your Subversion account. |
Default Version Control Settings Page | |
Version Control Folder |
Select the folder on the Subversion server where you want to check in files. If you currently have files under version control, select the folder on the server where these files are located. |
Working Folder |
Select a folder on the client computer to use as the root working folder. This is the location into which you will check out files. If you currently have files under version control, select your existing working folder. |
To add a file to version control
To browse the repository
In the Repository Browser you can right-click a file to perform one of the following actions. Available actions depend on the file's status.
Action | Description |
---|---|
Open | Open the file in Toad. |
Commit | Commit your changes. Available for Modified or Untracked files. |
Undo Changes | Discards your changes and reverts to the previous revision of the file (previous commit). Available when the file status is Modified. |
Get Latest Version | Check out the latest revision from the remote repository. Available when the file status is OutOfDate. |
To commit your changes
After modifying a file, right-click the document window tab and select File Version Control | Commit.
To compare revisions (Editor files only)
To check file status
Review the following file status definitions.
File Status | Definition |
---|---|
Untracked | The file has not been added to version control. Right-click the file in the Repository Browser and select Commit to add it to version control. |
UpToDate | The file in your working folder is synchronized with the file in the remote repository. No changes are detected. No action is required. |
Modified | The working copy of this file was modified. The changes are stored in the working folder only. Commit this file to add the changes to the remote repository. |
OutOfDate | A more recent revision of this file exists in the remote repository. To update your working copy, check out the latest revision from the remote repository (right-click the file and select Get Latest Version). |
Unknown | The file is under version control, but its status cannot be determined. |
Deleted | The file was under version control, but it was dropped or renamed in the working folder and exists only in the remote repository. |
Additional Actions
To configure version control for files, see Version Control for Toad Files.
To configure version control for Objects
Ensure that a supported version control client is installed on the computer where Toad is installed. See About Version Control for more information about tested version control clients and supported versions.
Right-click one or more objects in the Object Explorer and select Version Control | Version Control Wizard.
Note: Version control is configured .
Version Control System Page |
Description |
Type |
Select the version control system name:
|
Properties |
(Subversion only) Click this button (beside the Type field) and complete the binary path. Enter the path where the Subversion client that contains svn.exe is installed. For example, if you installed the CollabNet Subversion Client, you would enter: C:\Program Files\CollabNet Subversion Client Note: Do not include svn.exe in the path. |
Server |
Select one of the following:
|
Repository Settings |
Set your local Working Folder and your Version Control Folder will be automatically filled. |
User name/ Password |
Enter your Subversion command-line user name and password and click Login. Note: For TFS only, if you leave the user name and password fields blank, Toad uses your default Windows credentials. |
Version Control General Options Page | Description |
Prompt to Commit on Close | You will be asked to commit your changes before each version controlled file is closed |
Version Control Configurations Options Page |
Description |
Version control folder |
Select the folder on the version control server where you want to check objects in. If you already have objects under version control, select the folder on the server where these objects are located. Note: Version control automatically checks out objects in this folder and any subfolders to the location you specify in the Working folder field. |
Working folder |
Select the root repository folder on the client computer to use as the default working folder for checking objects out. If you already have objects under version control, select the existing working folder for these. |
Note: Version Control should be configured in Toad before you start managing objects. See Configure Version Control for Objects for more information.
To add objects under version control
» | Right-click an object and select Commit. |
Tips:
To manage objects under version control
Determine object's version control status. Hover a mouse over the object in the Object Explorer to see its status. Review the following for additional information:
Version Control status | Description |
---|---|
Uninitialized | The object status is undetermined yet. This is a temporary status that is issued for all objects during version control status processing. |
Untracked | The object is not added to version control. |
Ignored | The object is added to ignore list and excluded from version control. |
UpToDate | The object is under version control and is synchronized with version control repository. No changes are detected. |
Modified | The object is under version control and has been modified by user. The changes are stored in local database only and need to be synchronized with version control repository. |
Merge |
The object is under version control and has been modified in both local database and version control repository. Note:: Toad's Version Control feature does not allow to merge object scripts. |
OutOfDate | The object is under version control and has been modified in version control repository. |
Unknown |
The object is under version control but for some reason its status cannot be determined (for example, you created a script in your local database while the script with the same name already exists in version control repository, or you upgraded to a higher version of Toad and configured version control for the same repository while you have some uncommitted changes in the database). Tip: If you are sure that the object is up to date but is listed as unknown, commit the object in version control system to resolve unknown status. |
Deleted |
The object was under version control, but it was dropped or renamed in local database and exists only in version control repository. Tip: You can see deleted objects in the Controlled objects pane only. To access it right-click any object and select Show perspective. Once you commit changes in Controlled objects pane, the object with all history will be deleted from version control repository. |
NotInView | The object is under version control and exists in version control repository only. |
Right-click an object and select one of the following actions:
Use | To... |
---|---|
Show perspective | Select to review all controlled objects for current configuration. |
Diff |
Select to review differences between the object script in your local database and the object's revision that was applied to it. Note: Diff is unavailable for File System Based configuration. |
Diff with latest revision | Select to review differences between the object script in your local database and the latest revision in the version control repository. |
Example: You got the latest object revision from the repository 2 days ago. By the time you did it, the latest revision was 5. Yesterday your colleague worked with the same object and committed changes in the repository, which are now marked as revision 6. Today you altered the object's script and want to see the differences. You can select one of the following:
| |
Show history |
Select to review all commits for selected object. Tip: Select Show history on database to review all commits. Note: Show History is unavailable for File System Based configuration. |
Get latest revision | Select to apply object's changes from the version control repository to your local database. The synchronization script is generated to update selected object to the latest revision. |
Commit |
Select to apply object's changes from your local database to the version control repository. Note: You should write a comment when committing changes. |
Undo changes | Select to rollback changes in your local database. The synchronization script is generated to revert object to the revision which was a applied last time. |
Update status | Select to compare a script in your local database with the script in the repository. New status will be issued according to the comparison results. |
Add to ignore list | Select to exclude object from the version control. Ignored objects are not listed in Controlled Objects pane, Commit and Get latest revision are disabled. |
Remove from ignore list | Select to set object status as Untracked and add it to version control. |
Open in Windows Explorer | Select to navigate to the file in the Windows Explorer. |
Tip: You can enable, disable, or delete a version control configuration under Tools | Options | Version Control | Configurations.
© ALL RIGHTS RESERVED. Feedback Terms of Use Privacy