Re: How well does CVS handle other types of data?

[Greg A. Woods]

[ On Friday, July 13, 2001 at 20:42:57 (-0700), Mike Castle wrote: ]
> Subject: Re: How well does CVS handle other types of data?
>
> On Fri, Jul 13, 2001 at 04:03:09PM -0400, Greg A. Woods wrote:
> > [ On Friday, July 13, 2001 at 11:47:27 (-0700), Mike Castle wrote: ]
> > > presenting two versions of the files in question to the user.
> > 
> > Currently CVS does not present to versions of the file to the user.
> 
> Yes it does.
> 
> I tested it before I posted that.
> 
> address@hidden:40pm]~/a/test(533) cvs up -j foo
> cvs update: nonmergeable file needs merge
> cvs update: revision 1.1.2.1 from repository is now in file
> cvs update: file from working directory is now in .#file.1.2
> C file

Well I know it does that, but that's not exactly the full picture, nor
is it really sufficient for doing a merge if you do happen to have a
tool that'll do a three-way merge.  You need the ancestor revision too
and I'm not even sure you can always figure it out after the fact....

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>