[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Is it possible to merge together two files that CVS does not reco g
From: |
Jerry Nairn |
Subject: |
RE: Is it possible to merge together two files that CVS does not reco ginize as the same? |
Date: |
Fri, 11 May 2001 13:03:03 -0700 |
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:address@hidden
>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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- RE: Is it possible to merge together two files that CVS does not reco ginize as the same?,
Jerry Nairn <=