Re: (no subject)

[Larry Jones]

Deepak Khugher writes:
> 
> A repository for my project was created some time back. But the development 
> work continued without checking out a working copy from the repository. Also 
> the development work divided into two branches thinking that CVS would help 
> merge at a later stage. Now is there any chance to merge these two branches 
> of development which have been created without using CVS?

Assuming that some version of the project was checked in to CVS way back
when, your best bet is probably to check that version out and then
create a branch (or two, if you don't want either existing branch to be
the trunk).  Once you have that set up, check out each branch and copy
the corresponding current development sources over top of what was
checked out, do any necessary adds and/or removes, and commit.  That
gets everything into CVS so you can start figuring out what you want to
merge and how.  Also, threaten to break the fingers of any developer who
continues to make changes without having a checked out copy so you don't
have this problem again.  ;-)

-Larry Jones

I suppose if I had two X chromosomes, I'd feel hostile too. -- Calvin