My cvsmerge script

To those of you who are using my cvsmerge script:

The script have been updated to deal with a couple of "new" situations

* First it now verifies if there is any pending changes. If not, nothing
is done (helps mirroring of the repository)

* It now verifies that you haven't forgotten to commit any local changes
prior to merging in the changes from the tracked version

* If there is any merge conflicts then you are prompted to correct these
before continuing

* When the merge is done and you have corrected any conflicts, the
script automatically commits the changes.

and also some minor cosmetic changes.

The updated script can be downloaded from squid.sourceforge.net/CVS.html
in about 30 minutes, or from the website CVS module immediately.

/Henrik
Received on Fri Sep 08 2000 - 05:09:47 MDT