[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS update problem
From: |
Nagaraj Birur |
Subject: |
CVS update problem |
Date: |
Fri, 12 Oct 2001 17:05:43 +0530 |
Hi,
I have 2 repositories (say A and B). A file is common to both these
repositories.
This file is undergoing simultaneous modifications (independently checked
out from both the repositories). I need to merge both the modifications.
I tried to move the file from repository A to the relevent directory in
repository B and tried to do a cvs update. It failed. I still see only the
file which I moved. When I tried to do a cvs diff <script name> it shows the
difference.
How could I merge by updating from the repository ?
Thanks,
Guru
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- CVS update problem,
Nagaraj Birur <=