You don't need to do a commit before you try the merge. If you know the revision of the file when it was copied to the new location, that would help. >From: Charles Corley [mailto:[EMAIL PROTECTED]] >Sent: Friday, May 11, 2001 12:53 PM >module1/fileX > >needs to be merged with > >module2/folder/fileX > >The only way I can think of to attempt this is: > >cp module1/fileX module2/folder/fileX >cvs ci fileX > >and then merging the differences between the two revisions so cp module1/fileX module2/folder/fileX cvs up -j <revision-when-copied> -j HEAD module2/folder/fileX should work. Jerry _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
