| Source Control and CDT-based products [message #98313] |
Tue, 30 March 2004 11:35  |
Eclipse User |
|
|
|
Originally posted by: crecoskie.ti.com
Hello all,
Currently I'm grappling with some issues regarding source control for our
upcoming product based on CDT 2.0...
Essentially the problem I need to solve is forking off our own development
based on Eclipse and CDT in our own local source control, but periodically
pulling in the most recent changes out of CVS on dev.eclipse.org, and
merging those changes down from the parent branch (which would only ever
contain virgin sources from dev.eclipse.org) down into the development
branches on which we do our actual work.
The tricky part is the regular importantion of changes from
dev.eclipse.org. From my research, CVS and Clearcase do not seem to
handle this very well.
I have looked into cloning the dev.eclipse.org CVS repository but so far
all the methods I have found (e.g. CVSup) will obliterate your local
changes to the repository.
Clearcase will update from CVS or a flat file system, but it will not
detect renames at all. The set of files you get after the update will be
all the old files plus all the new files (i.e. if you have a rename, it
will create the element with the new name, but won't remove the old one or
mv it to the new name to preserve history).
BitKeeper seems to handle things better. You can import patch files
directly as updates, so I can just grab the latest source out of the HEAD,
use diff to create a patch file to what I already have in the local
repository, and then import the patch. BK actually has a tool which will
let you resolve file renames in any given update (since the patch will
just show a rename as a file removal and a file creation, with no metadata
indicating the two are related).
I am sure there are other people out there which are also having to solve
this problem. The question is, how have you tackled it? I am wondering
if there is some easier method for this that I am missing. BitKeeper fits
my needs perfectly but I'm tasked with exhausting all other, cheaper
avenues first.
Any thoughts?
Regards,
Chris Recoskie
Software Designer
IDE Frameworks Group
Texas Instruments, Toronto
|
|
|
| Re: Source Control and CDT-based products [message #98359 is a reply to message #98313] |
Wed, 31 March 2004 11:25  |
| Eclipse User |
|
|
|
Originally posted by: crecoskie.ti.com
Chris Recoskie wrote:
> Clearcase will update from CVS or a flat file system, but it will not
> detect renames at all. The set of files you get after the update will be
> all the old files plus all the new files (i.e. if you have a rename, it
> will create the element with the new name, but won't remove the old one or
> mv it to the new name to preserve history).
Minor error... I am pretty sure ccase will actually rmname the old element
due to the new version of the directory not having the file.
Need to start doing less work and getting more sleeeeeep...
Chris
|
|
|
Powered by
FUDForum. Page generated in 0.02819 seconds
Home