Re: CVS problems

Ouch... not good. The script did not notice the failure and went ahead
moving the version tracking to the current HEAD version, causing cygwin
to skip the pending changes in HEAD.

Looks like you have no choice but to manually do the merge. Use the diff
function and try to identify what is missing from the cygwin branch.

The script uses "-e" to make sure things like this does not happen, but
apparently it is not foolproof. Looks like resurrecting the "old"
tracking tag might be a good idea to ensure mishaps like this can be
solved more easily in the future.

Regards
Henrik

Guido Serassio wrote:
>
> Hi Henrik,
>
> Today I was "cvsmerging" the cygwin branch with HEAD, but during cvsmerge I
> have the following error:
>
> # Set a temporary tag at the new version we are merging towards...
> cvs -z9 -q rtag -F -r HEAD Z-cygwin_merge-new_HEAD squid
> # Merge changes into the working directory...
> cvs -z9 -q update -kk -d -P -j Z-cygwin_merge_HEAD -j Z-cygwin_merge-new_HEAD
> Connection closed by 216.136.171.202
> cvs [update aborted]: end of file from server (consult above messages if any)
> # Prune out RCS keywords...
> # Checking for conflicts...
> # Commit the changes...
> cvs -z9 -q commit -m Merged changes from HEAD
> # Move our baseline to the new version(s)...
> cvs -z9 -q rtag -F -r Z-cygwin_merge-new_HEAD Z-cygwin_merge_HEAD squid
> Done.
>
> I have retried the merge, but the result is:
>
> $ ../cvsmerge.sh HEAD
> # Check if there is any pending changes in the repository...
> cvs -z9 -q rdiff -kk -r Z-cygwin_merge_HEAD -r HEAD squid
> # No pending changes...
>
> But changes on HEAD was not merged ...
>
> Can You help me ?
>
> Thanks
>
> Guido
>
> -
> =======================================================
> Serassio Guido
> Via Albenga, 11/4 10134 - Torino - ITALY
> Tel. : +39.011.610749
> E-mail: serassio@interfree.it
> serassio@libero.it
> WWW: http://www.serassio.it
Received on Thu Oct 18 2001 - 14:06:03 MDT