</section>
</section>
- <section id="Configuration_vcs">
- <title>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></title>
-
- <para>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.</para>
-
- <itemizedlist>
- <listitem>
- <para><guilabel>None</guilabel> (default): When you save a file in
- WinMerge, there are no interactions with any version control
- system.</para>
- </listitem>
-
- <listitem>
- <para><guilabel>Visual SourceSafe (less than 5.0)</guilabel></para>
-
- <para>Also enter the path to <filename>SS.EXE</filename>.</para>
- </listitem>
-
- <listitem>
- <para><guilabel>Visual SourceSafe (5.0 and above)</guilabel></para>
- </listitem>
-
- <listitem>
- <para><guilabel>Rational ClearCase</guilabel></para>
-
- <para>Also enter the path to <filename>cleartool.exe</filename>.</para>
- </listitem>
- </itemizedlist>
-
- <para>See <xref linkend="VersionControl_vcs" /> for details about using this
- feature.</para>
- </section>
-
<section id="Configuration_codepage">
<title>Codepage page<indexterm>
<primary>codepage</primary>
</indexterm></title>
<para>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.</para>
-
- <section>
- <title>Checking out versioned files from WinMerge</title>
-
- <indexterm>
- <primary>Visual SourceSafe integration</primary>
- </indexterm>
-
- <para>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.</para>
-
- <para>This integration is available after WinMerge installation. To enable
- or disable the integration, click <menuchoice>
- <guimenu>Edit</guimenu>
-
- <guimenuitem>Options</guimenuitem>
- </menuchoice>, open the Version Control integration page, and choose the
- appropriate option.</para>
-
- <example>
- <title>Visual Source Safe integration</title>
-
- <para>Here is a sample file checkout using the VSS integration.</para>
-
- <orderedlist>
- <listitem>
- <para>Launch a WinMerge file or folder comparison whose left or
- right target is under version control.</para>
- </listitem>
-
- <listitem>
- <para>In WinMerge, edit a version-controlled file.</para>
- </listitem>
-
- <listitem>
- <para>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:</para>
-
- <mediaobject>
- <imageobject>
- <imagedata fileref="screenshots/sourcesafe1.png" format="PNG" />
- </imageobject>
- </mediaobject>
- </listitem>
-
- <listitem>
- <para>In the <guilabel>Database</guilabel> dropdown list, choose the
- correct Visual SourceSafe database if there is more than one on your
- system.</para>
- </listitem>
-
- <listitem>
- <para>The <guilabel>Project</guilabel> 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!</para>
- </listitem>
-
- <listitem>
- <para>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.</para>
- </listitem>
-
- <listitem>
- <para>Optionally, enable one or both of these options:</para>
-
- <itemizedlist>
- <listitem>
- <para><guilabel>Link to Destination VSS
- project</guilabel></para>
- </listitem>
-
- <listitem>
- <para><guilabel>Apply to all items</guilabel>. This option
- enables you to check out multiple files in a single directory
- when you copy files in a folder compare operation.</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </orderedlist>
-
- <para>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:</para>
-
- <itemizedlist>
- <listitem>
- <para>Another user might have the file checked out with exclusive
- access.</para>
- </listitem>
-
- <listitem>
- <para>You might have specified the wrong project.</para>
- </listitem>
-
- <listitem>
- <para>You might have entered the project name incorrectly.</para>
- </listitem>
-
- <listitem>
- <para>You might not have used a valid VSS path (for example, this is
- incorrect: <userinput>$/MyProject/res</userinput>).</para>
- </listitem>
-
- <listitem>
- <para>Your connection to the VSS server computer might be
- broken.</para>
- </listitem>
- </itemizedlist>
- </example>
- </section>
+ control systems (VCS). This section describes the VCS integration and provides some examples.</para>
<section>
<title>Using WinMerge as a version control system's diff tool</title>
</section>
</section>
</section>
-</article>
\ No newline at end of file
+</article>
OSDN Git Service
