PVCSmerge
Copyright (C) 2005 by Michael Jelich

_________________
What is PVCSmerge

If you use PVCS Version Manager, and you know Beyond Compare, the 'State of the Art'
Comparison Tool for Software Developers, you surely want to use that great tool instead
of the included PVCSmerge tool.

PVCS provides no means to configure a different 3rd party comparison tool.

That's why I've developed this tool. It gives each user of PVCS the ability to decide,
which comparison tool to use. This is important, if PVCS is installed on a network drive
and there is at least one PVCS user not having Beyond Compare installed. This user should
keep the possibility to use the built-in PVCSmerge tool...

____________
Installation

This tool is tested with Merant PVCS 8.0.

Step 1: If you have this version of PVCS, locate the installation folder and open the sub-
        directory containing the PVCSmerge.exe (usually [Program Files]\PVCS\vm\win32\bin)

Step 2: Rename PVCSmerge.exe to PVCSmerge.exe.exe (don't care about the name; I just
        needed a different name and took that one; only this name will work)

Step 3: Copy the PVCSmerge.exe from this archive to the bin subdirectory of the PVCS
        installation folder, so that the PVCSmerge.exe and PVCSmerge.exe.exe resides in
        the same folder.

That's it. On the first comparison invoked by PVCS (or if you start PVCSmerge.exe
directly) you'll get a small dialog where you can decide the comparison tool to use -
Beyond Compare or PVCS Merge Tool. If my tool cannot find the Beyond Compare program,
you can specify its location here.

_____________________
Benefits and Features

- You can select one or two revisions or labels in PVCS and select 'compare' by clicking
  on the corresponding button or pressing [ctrl]+d.
- This will invoke my tool PVCSmerge.exe. Regarding on the decision made on the first call
  (or a later direct call) my tool will redirect the request either to Beyond Compare or
  the built in PVCS Merge Tool (which you have renamed to PVCSmerge.exe.exe).
- Beyond Compare will show either
  - the Revision (if you have selected a revision of a file which is currently checked in)
  - the Label (if you have selected a label of a file which is currently checked in) or
  - the file name (if the compared file is checked out)
- one advantage of this tool is the ability to run in a network installation of PVCS. If
  one or more user do not have Beyond Compare, they are able to use the built-in tool
  while the luckily ones are able to use their favorite tool ;-)

______________
Deinstallation

I cannot imagine - but, however:
Temporarily: Call PVCSmerge.exe and select PVCS Merge Tool to become the Comparison Tool.
Permanently: Delete PVCSmerge.exe and rename PVCSmerge.exe.exe back to its original name.

_________
Licensing

This program is Freeware. You are allowed to use it, if you accept the 'Terms of Use'.

____________
Terms of Use

This software is provided "as is", without any guarantee made as to its suitability or
fitness for any particular use. It may contain bugs, so use of this tool is at your own
risk. We take no responsilbity for any damage that may unintentionally be caused through
its use.

You may not distribute PVCSmerge in any form without express written permission of
Michael Jelich.

_______
History

1.1  08.08.2005 - additions for Merant Dimensions 8.0.5 via PC Client 2.9.4.0
1.2  13.08.2005 - left/right side for Ancestor/Derivate is now configurable
1.3  17.08.2005 - program renames *.tmp-files to their original extension; therefore, BC2
                  is able to use the comparison rule assigned to that file extension
1.4  20.02.2006 - Problems when comparing ZIP-Files from disk solved
1.5  10.06.2006 - Supports filenames with suffixes (like filename.doc;ca#1) as used in
                  Merant Dimensions

__________________
Reporting Problems

If you encounter problems, please visit the homepage of Scooter Software
(http://www.scootersoftware.com/support.php?c=kb_vcs.php) and download the latest version
to see if the issue has been resolved. If not, please send a bug report to:

	edv@jelich.info
