[EMAIL PROTECTED] on 06/06/2000 01:50:41 PM
>>> Now when the laptop is on the "go", I would
>>> like to change the modules but
>>> **under CVS control**. For this purpose,
>>> I will bring the checked out modules to a
>>> local repository using WinCVS.
>>
>>CVS doesn't work like that. You check your modules in when you
>>connect back into the LAN. I suspect it could be arranged to have multiple
>>repositories (with a program to fudge the 'Root' files), but it'd get very
>confusing
>>very fast (how would you keep the version numbers in sync, for example).
>
>
>This sort of disconnected operation
>(checkin while disconnected, merge repositories
>when connected) is supported by BitKeeper, www.bitkeeper.com.
>
>BitKeeper is apparently becoming popular with
>Open Source projects such as the LINUX kernel.
What happens when there're conflicts during the repository merge?
I think what can be done to mitigate such circumstances would be to do remote
development on a branch. It's fairly trivial to merge changes solely along a
branch. At some point, someone will still have to merge the remote branches
into mainline development.
IMHO, the underlying RCS format in CVS hinders the above strategy since the
typical merge algorithm (ie line by line) can't be used. So, to incorporate
such a thing in CVS would require either abandoning the RCS format or coming up
with an intelligent algorithm that can figure out where branches and revisions
really are.
Noel
This communication is for informational purposes only. It is not intended as
an offer or solicitation for the purchase or sale of any financial instrument
or as an official confirmation of any transaction. All market prices, data
and other information are not warranted as to completeness or accuracy and
are subject to change without notice. Any comments or statements made herein
do not necessarily reflect those of J.P. Morgan & Co. Incorporated, its
subsidiaries and affiliates.
