Re: Problem merging a branch

[Derek R. Price]

Without trying to understand exactly what you are proposing, which is why
I wanted a reproducible bug in a script in the first place, something like the
following:

     #! /bin/sh
     mkdir /tmp/cvs-bugreport
     cvs -d/tmp/cvs-bugreport init
     export CVSROOT=:fork:/tmp/cvsroot

Then mkdir/copy/cat whatever directories and archives you need into
/tmp/cvs-bugreport and do whatever you need to do to reproduce the bug.

Derek
--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
I will not do that thing with my tongue.
I will not do that thing with my tongue.
I will not do that thing with my tongue...

          - Bart Simpson on chalkboard, _The Simpsons_

Dennis Jones wrote:

> Derek,
>
> I've tried deleting the directory in which the file resides, and doing a
> "cvs up -d", and I get all of the files back in both the main trunk and the
> branch, so I am not sure how the file could be "coming out empty."  It's
> fine when doing an update.
>
> I'm also not sure of what you would want from a script.  You mean create a
> new repository and mess with it too so as to try and make it fail with the
> same error too?  I'm not sure I can do that since I don't know what I did to
> cause the problem in the first place.  I am wondering if there isn't an
> easier solution.  For example:
>
> 1) copy the files from the branch to somewhere safe
> 2) delete the branch (cvs tag -d)
> 3) re-create the branch using the date that the orignal branch was was
> created (cvs tag -b -D), thereby duplicating its initial starting point
> 4) copy the files from the saved location into the new branch (minus the CVS
> administrative files of course)
> 5) use the new branch to do the merge
> 6) continue development on the branch
>
> Or even easier, and perhaps safer:
>
> 1) create a new branch using the date of the original branch (cvs tag -b -D)
> 2) copy the files from the old branch to the new one (sans CVS files)
> 3) merge to the trunk using the new branch
> 4) delete the old branch
>
> I'm the only one using this branch (it's just a temporary development
> branch), so I don't have to worry about affecting anyone else.
>
> - Dennis
>
> ----- Original Message -----
> From: "Derek R. Price" <address@hidden>
> To: "Dennis Jones" <address@hidden>
> Cc: "CVS Mailing List" <address@hidden>
> Sent: Tuesday, February 27, 2001 7:07 AM
> Subject: Re: Problem merging a branch
>
> > Dennis Jones wrote:
> >
> > > cvs server: Updating .
> > > RCS file: /vol/cvs/Projects/About/About.cpp,v
> > > retrieving revision 1.4
> > > retrieving revision 1.4.2.1
> > > Merging differences between 1.4 and 1.4.2.1 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
> >
> > --
> > Derek Price                      CVS Solutions Architect (
> http://CVSHome.org )
> > mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
> > --
> > #! perl
> > @a = ( 0x2E805,0x6B39,0x15B3,0x45993,0x153C,0x1D9F );
> > for ( @a ) { ( $s, $i )=( 'a', 0 ); $s++ while $i++ < $_; print "$s" }