On Mon, 19 May 2003, Arto Selonen wrote:

> Hi!
>
> On Mon, 19 May 2003, Jeremy C. Reed wrote:
>
> > On Mon, 19 May 2003, Arto Selonen wrote:
> >
> > > Copying set comp
> > > pax: Unable to access <<<<<<< (No such file or directory)
> > > pax: Unable to access ======= (No such file or directory)
> > > pax: Unable to access >>>>>>> (No such file or directory)
> >
> > These lines look like a CVS conflict. Do a
> >   grep -r "=======" src/distrib/sets/lists/comp
>
> Ha! Thanks for the quick reply (also to Paul Goyette). I totally
> missed those conflict/merge lines in the CVS output.
> That's what I get for messing with the source files manually, instead of
> waiting for the proper file to come out of anoncvs, and then forgetting
> about it. It took about 10 minutes to realize *why* there were conflicts,
> and after realization 1 minute to fix everything. Built & installed fine!

Whenever I do a cvs update, I do "cvs update ... |& tee cvslog" so that I
tee everything to a file. I then vi the file, and scan for 'C' in the 1st
column ("/^C"). There's no way I can keep up with the messages otherwise.
:-)

Take care,

Bill