From 5d0d74235f53c9601bfb7cbe1db437b2a917bbd5 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 13 Nov 2018 07:06:05 +0100 Subject: [PATCH] Drop ClearCase from Manual --- Docs/Users/Manual/Install.xml | 16 ------------ Docs/Users/Manual/Intro_diffs.xml | 2 +- Docs/Users/Manual/Version_control.xml | 40 +++-------------------------- Docs/Users/Manual/tour/tour_sel_targets.xml | 9 +------ 4 files changed, 6 insertions(+), 61 deletions(-) diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index 03cda0eca..925890b39 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -264,22 +264,6 @@ - Integrate with Rational ClearCase - ClearCase integration - - configuring during installation - - - - Sets WinMerge to be the ClearCase diff application. - - For more information about the three integrations in this - list and related WinMerge options, see . - - - - Create a Desktop shortcut diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 2a5b572a9..7fce1425d 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -270,7 +270,7 @@ Believe it or not. contributor. Merging can be prompted (or even initiated) by version control systems - like Subversion and ClearCase. For example, your version control system + like Subversion and Git. For example, your version control system might prevent you from submitting changes to its repository because of merge conflicts. A conflict can occur if someone else checked in a different version of the same file while you were working on your version, and the diff --git a/Docs/Users/Manual/Version_control.xml b/Docs/Users/Manual/Version_control.xml index ed97803e3..ec821186b 100644 --- a/Docs/Users/Manual/Version_control.xml +++ b/Docs/Users/Manual/Version_control.xml @@ -42,7 +42,7 @@ Similarly, many GUI tools (like version control clients and IDEs) that include built-in diff tools enable you to configure WinMerge as their default diff tool, instead. The next section describes how to use WinMerge - this way with TortoiseSVN, TortoiseCVS, and ClearCase. For other tools, + this way with TortoiseSVN and Visual Studio Team Foundation Server. For other tools, like Eclipse and Perforce, check their documentation or search the Internet for details and examples. @@ -65,8 +65,8 @@ TortoiseSVN integration - When you compare files in TortoiseSVN, TortoiseCVS, or Rational - ClearCase, you can have the VCS launch WinMerge instead of its native diff + When you compare files in TortoiseCVS, TortoiseSVN, or TortoiseGIT, + you can have the VCS launch WinMerge instead of its native diff utility. You can configure some of these integrations during WinMerge installation. @@ -74,7 +74,7 @@ Tortoise SVN integration Here is a sample diff operation in TortoiseSVN that uses the - WinMerge integration. The integrations with TortoiseCVS and ClearCase + WinMerge integration. The integrations with TortoiseCVS and TortoiseGIT are similar. @@ -209,38 +209,6 @@ Every time you tell TFS to compare two files, it will now use WinMerge. - -
- About the ClearCase integration - - When you choose the integration option for Rational ClearCase - during WinMerge installation, the installer: - - - - Creates a backup copy of the ClearCase - map file, map.bak, in the - ccase-home-dir\lib\mgrs - directory. The map file is a user-configurable - file that associates ClearCase methods with the programs that carry - them out. - - - - Modifies the text_file_delta field In the - map file, specifying WinMerge instead of the - default cleardiff.exe when running the - cleartool diff command. - - - - If you later want to disable WinMerge interactions with ClearCase, - replace the ClearCase map file created by the - WinMerge installer with the map.bak backup file. - Alternatively, edit the ClearCase map file to run - cleardiff.exe for the cleartool - diff command. -
diff --git a/Docs/Users/Manual/tour/tour_sel_targets.xml b/Docs/Users/Manual/tour/tour_sel_targets.xml index 829f06923..a2a04b17a 100644 --- a/Docs/Users/Manual/tour/tour_sel_targets.xml +++ b/Docs/Users/Manual/tour/tour_sel_targets.xml @@ -166,16 +166,9 @@
Version control systems - If you run TortoiseSVN, TortoiseCVS, or Rational ClearCase, you can + If you run TortoiseCVS, TortoiseSVN, or TortoiseGIT, you can configure your version control system to open WinMerge directly. That is, if you compare files using one of these VCS tools, WinMerge opens instead of the tool's native diff utility. - - - Another handy VCS integration automatically launches your version - control system's checkout dialog whenever you change a managed file in the - WinMerge window. This integration works with version control systems that - lock files, specifically ClearCase and Visual Source Safe. -
\ No newline at end of file -- 2.11.0