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
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
In article [EMAIL PROTECTED], Zanabria, Moises wrote:
That does mean that is no way to check a merge before I really want to
merge??
A merge operation does nothing to the repository; all it does is edit your
local files. A separate commit step is necessary to put the results of
the merge into
Zanabria, Moises [EMAIL PROTECTED] writes:
That does mean that is no way to check a merge before I really want to
merge??
Yes there is. The merge isn't really over until you commit the
result. The entire process looks like this:
1) Check out a *clean* copy from the tip of the trunk. After
