From: Takashi Sawanaka Date: Wed, 10 Oct 2018 13:48:02 +0000 (+0900) Subject: Manual: Eliminate old Version Control feature X-Git-Tag: 2.16.5~645 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=18fc6b61809177d472fb44be0d13b213efd16d3f;p=winmerge-jp%2Fwinmerge-jp.git Manual: Eliminate old Version Control feature --- diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index 37bd9a51e..b85f4504d 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -1462,50 +1462,6 @@ -
- Version Control page<indexterm> - <primary>version control systems</primary> - - <secondary>configuring after installation</secondary> - </indexterm><indexterm> - <primary>integration</primary> - - <secondary>with version control systems</secondary> - </indexterm> - - Use this page to enable or disable checkouts through an installed - version control system (VCS) that you select here. If you enable this - integration with one of the supported systems, WinMerge opens the checkout - dialog for that VCS when you save a versioned file in WinMerge. - - - - None (default): When you save a file in - WinMerge, there are no interactions with any version control - system. - - - - Visual SourceSafe (less than 5.0) - - Also enter the path to SS.EXE. - - - - Visual SourceSafe (5.0 and above) - - - - Rational ClearCase - - Also enter the path to cleartool.exe. - - - - See for details about using this - feature. -
-
Codepage page<indexterm> <primary>codepage</primary> diff --git a/Docs/Users/Manual/Version_control.xml b/Docs/Users/Manual/Version_control.xml index bcef62f4b..ed97803e3 100644 --- a/Docs/Users/Manual/Version_control.xml +++ b/Docs/Users/Manual/Version_control.xml @@ -56,129 +56,7 @@ </indexterm> You can configure WinMerge to interact with a few supported version - control systems (VCS) in two ways. This section describes the two types of - VCS integration and provides an example of each. - -
- Checking out versioned files from WinMerge - - - Visual SourceSafe integration - - - When you save a file in WinMerge and the file is a versioned - ClearCase or Visual Source Safe element, WinMerge can open the VCS's - checkout dialog for you. This makes it easy to check out files as you are - working in WinMerge. However, WinMerge does not provide checkin or history - tools, so remember to check the files in later using the VCS - interface. - - This integration is available after WinMerge installation. To enable - or disable the integration, click - Edit - - Options - , open the Version Control integration page, and choose the - appropriate option. - - - Visual Source Safe integration - - Here is a sample file checkout using the VSS integration. - - - - Launch a WinMerge file or folder comparison whose left or - right target is under version control. - - - - In WinMerge, edit a version-controlled file. - - - - Save your changes. WinMerge detects that the file is - read-only, and assumes that it is under Visual Source Safe version - control. WinMerge opens a Visual Source Save dialog, like - this: - - - - - - - - - - In the Database dropdown list, choose the - correct Visual SourceSafe database if there is more than one on your - system. - - - - The Project field shows the selected - file's location relative to the Visual SourceSafe database path. - Verify that the path is correct: most errors are caused by the wrong - project path. If you change folders, remember to change the project - path, too! - - - - Enter your password if required. WinMerge remembers your - password for the current session, but for your security does not - store it. Therefore, you don't need to retype the password during a - session, but you must retype the password each time you open - WinMerge. - - - - Optionally, enable one or both of these options: - - - - Link to Destination VSS - project - - - - Apply to all items. This option - enables you to check out multiple files in a single directory - when you copy files in a folder compare operation. - - - - - - Unfortunately, VSS provides very little information about error - conditions beyond the fact that they occur. If an operation fails, - causes might include any of the following conditions: - - - - Another user might have the file checked out with exclusive - access. - - - - You might have specified the wrong project. - - - - You might have entered the project name incorrectly. - - - - You might not have used a valid VSS path (for example, this is - incorrect: $/MyProject/res). - - - - Your connection to the VSS server computer might be - broken. - - - -
+ control systems (VCS). This section describes the VCS integration and provides some examples.
Using WinMerge as a version control system's diff tool @@ -365,4 +243,4 @@
- \ No newline at end of file + diff --git a/Docs/Users/Manual/screenshots/sourcesafe1.png b/Docs/Users/Manual/screenshots/sourcesafe1.png deleted file mode 100644 index f399f293c..000000000 Binary files a/Docs/Users/Manual/screenshots/sourcesafe1.png and /dev/null differ