[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Problem merging a branch

From: Derek R. Price
Subject: Re: Problem merging a branch
Date: Tue, 27 Feb 2001 10:07:26 -0500

Dennis Jones wrote:

> cvs server: Updating .
> RCS file: /vol/cvs/Projects/About/About.cpp,v
> retrieving revision 1.4
> retrieving revision
> Merging differences between 1.4 and into About.cpp
> cvs server: About.cpp: No such file or directory

This shouldn't be happening.  It sounds like the server didn't create one of
the files it was supposed to before attempting the diff3/merge.  If you were
messing with the repository and have a corrupt archive, it's possible that one
of the files came out empty when it wasn't supposed to, so the server still
expected it.  Can you create a short Bourne shell script which, say, inits a
repository, copies About.cpp,v in, checks it out, then recreates your merge
& error case.  This script should use a CVSROOT with the :fork: access method
to fake client/server operation.

If you can supply this script I'll look into it further.


Derek Price                      CVS Solutions Architect ( )
mailto:address@hidden     OpenAvenue ( )
#! perl
@a = ( 0x2E805,0x6B39,0x15B3,0x45993,0x153C,0x1D9F );
for ( @a ) { ( $s, $i )=( 'a', 0 ); $s++ while $i++ < $_; print "$s" }

reply via email to

[Prev in Thread] Current Thread [Next in Thread]