That does mean that is no way to check a merge before I really want to merge?? Moises
-----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] Sent: Thursday, December 20, 2001 3:17 PM To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Subject: Re: cvs merge crash !! Zanabria, Moises writes: > > cvs -n update -l -jXXX > RCS file: /cvsroot/migration/makefile,v > retrieving revision 1.2 > retrieving revision 1.2.2.1 > Merging differences between 1.2 and 1.2.2.1 into makefile > cvs server: makefile: No such file or directory What are you trying to do? The -n global option says not to actually modify any files, so the client doesn't bother sending the file to the server, which is why the server can't find it. -Larry Jones I hate it when they look at me that way. -- Calvin _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
