RE: Merging in CVS

PM To: MacMunn, Robert Cc: [EMAIL PROTECTED] Subject: RE: Merging in CVS >From my experience, technically the way CVS performs merges is fine. The biggest problem has been misunderstanding of how to correctly perform a merge, and this is a problem you can have with any tool. I've had in

RE: Merging in CVS

Thanks -Original Message- From: Kaz Kylheku [mailto:[EMAIL PROTECTED]] Sent: Friday, November 22, 2002 1:44 PM To: MacMunn, Robert Cc: [EMAIL PROTECTED] Subject: Re: Merging in CVS On Fri, 22 Nov 2002, MacMunn, Robert wrote: > Thanks. Looks like merges must be difficult in CVS.

RE: Merging in CVS

d. I am just trying to figure out what we gain and what we lose. -Original Message- From: 'Thomas S. Urban' [mailto:[EMAIL PROTECTED]] Sent: Friday, November 22, 2002 1:39 PM To: MacMunn, Robert Cc: [EMAIL PROTECTED] Subject: Re: Merging in CVS So use Clearcase if it provides s

RE: Merging in CVS

Not at all. In Clearcase you have a graphical interface where the conflicts can be taken care of as the merge happens. No manual editting of files. -Original Message- From: Thomas S. Urban [mailto:[EMAIL PROTECTED]] Sent: Friday, November 22, 2002 1:16 PM To: MacMunn, Robert Cc: [EMAIL

RE: Merging in CVS

It isn't a slick interface. In Clearcase it is the merge tool itself that gives you the ability to deal with the conflicts easily. -Original Message- From: 'Thomas S. Urban' [mailto:[EMAIL PROTECTED]] Sent: Friday, November 22, 2002 1:27 PM To: MacMunn, Robert Cc: [

RE: Merging in CVS

Thanks. Looks like merges must be difficult in CVS. A lot of manual work. -Original Message- From: Kaz Kylheku [mailto:[EMAIL PROTECTED]] Sent: Friday, November 22, 2002 12:18 PM To: MacMunn, Robert Cc: [EMAIL PROTECTED] Subject: Re: Merging in CVS On Fri, 22 Nov 2002, MacMunn, Robert

Merging in CVS

I am new to CVS. I am testing out merging. When I merged 2 files I got extra lines teling me where the merged lines where. Is there any way around this ? Ex. The <<< and > delimit the merged lines. #ss #tt #ll #kkk SRC has been automatically set to /proj/ace/src/

Trouble building CVS on NT, I just need the client

I am using Microsoft Visual C++ V 6.0 I am getting the following error. Any help would be appreciated. cl.exe /nologo /ML /W3 /GX /Ob1 /I "windows-NT" /I "lib" /I "src" /I "zl ib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "HAVE_CONFIG_H" /Fp".\WinRel/cvsnt.p ch" /YX /Fo".\WinRel/" /c .\li

Can't build cvs for NT.

I am using Microsoft Visual C++ V 6.0 I am getting the following error. Any help would be appreciated. cl.exe /nologo /ML /W3 /GX /Ob1 /I "windows-NT" /I "lib" /I "src" /I "zl ib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "HAVE_CONFIG_H" /Fp".\WinRel/cvsnt.p ch" /YX /Fo".\WinRel/" /c .\li

Having trouble building CVS

I am building CVS on Solaris 8. I am getting the following when I try to make. Any help is appreciated pebblebeach# make make all-recursive Making all in lib Making all in zlib Making all in diff Making all in src make all-am source='server.c' object='server.o' libtool=no \ depfile='.deps/serv