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

[Mike Castle]

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
address@hidden:40pm]~/a/test(534) ls -latr
total 20
drwx------    5 nexus    users        4096 Jul 13 20:38 ../
-rw-------    1 nexus    users          22 Jul 13 20:40 .#file.1.2
-rw-r--r--    1 nexus    users          14 Jul 13 20:40 file
drwx------    2 nexus    users        4096 Jul 13 20:40 CVS/
drwx------    3 nexus    users        4096 Jul 13 20:40 ./

mrc
-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc