Re: Linex need serious concurent version control software ?
In article [EMAIL PROTECTED], Bogdan [EMAIL PROTECTED] wrote: I just wander if cvs can make merging kylix project files? My guess is that it will make a mess. I have used CVS (and perforce) to manage the .bpr files on other platforms. It's doable, if a bit of a pain. It's pretty much a straight forward XML file. However, it IS formated by software which likes to throw in line breaks at obnoxious points. For example, instead of something like the xml equivalent of: SOURCES = foo.c bar.c baz.c it does SOURCES = foo.c bar.c baz.c with line wraps (probably around 80 chars or so). I believe it also keeps a listing for object files as well. So, if you add a new file at the beginning, it changes a LOT of lines. So, yes, that can make merging a significant pain. But I don't know of any tool that would handle that well. What I usually do is merge, handle the sources conflicts, and nuke the object file listing, and let the borland tools rebuild those parts of it. Occasionally there may be some conflicts with defines and what not. But, to be honest, most of those issues exist with Makefile as well. At least with being xml, you could probably write a filter that could put each item on it's own line, which could reduce conflicts. mrc -- Mike Castle [EMAIL PROTECTED] www.netcom.com/~dalgoda/ We are all of us living in the shadow of Manhattan. -- Watchmen fatal (You are in a maze of twisty compiler features, all different); -- gcc ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Linex need serious concurent version control software ?
Bogdan writes: I just wander if cvs can make merging kylix project files? My guess is that it will make a mess. What exactly do you mean by project files? As long as they're text files, it should work pretty well. -Larry Jones Honey, are we out of aspirin again? -- Calvin's Dad ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Linex need serious concurent version control software ?
I just wander if cvs can make merging kylix project files? My guess is that it will make a mess. I've never seen a Kylix project file, so I can't answer. If you could give several lines of an example (of course, if it doesn't work with lines, then CVS can't merge it), perhaps we could answer that. The other technique is to try it and see. If this is so, then there is a need to restrict concurrent programmers from editing Kylix project files at same time, but allow editing of .cpp files. This can be done with (a) CVS's current editor facilities, and (b) an enforced policy. CVS is not a replacement for responsible employees. If you can't trust your employees not to violate policies and mess files up, you need to fire them and replace them. (There's lots of developers looking for jobs right now, so that shouldn't be too difficult.) BTW, if developers edit Kylix project files with a text editor, it's almost certainly going to be useful for CVS merging. Cvs version 1.11.2 is not capable of during that selective restriction. I think there is a time to write serious version control that will allow using Kylix by more then one person for programming. CVS will work just fine, as far as you've described it. If you ready know HOW TO MAKE restrictive editing for only some files using cvs, then post it on the news. I think this is impossible with cvs, and we need better tool. Easy. Use the editor facility to let everybody know who's doing what, and have some policies to follow. If somebody consistently violates policy, fire him or her. With the job market what it is, I'm sure that person will make an excellent example for the others. PS Do you now that by cvs checkout your_project in another directory you are now longer reported by cvs editors despite you have files open for editing with command cvs edit in first directory. If you're not reported by cvs editors for what you have cvs edited, then that's a bug. If it doesn't report you as an editor for a file you haven't cvs edited, then that's normal behavior. We need more serious accounting in version control software. Alternately, we need version control people who understand what version control can and cannot do. -- Now building a CVS reference site at http://www.thornleyware.com [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
RE: Linex need serious concurent version control software ?
We need more serious accounting in version control software. (Rumble...) (Duck! Run!) ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Linex need serious concurent version control software ?
[EMAIL PROTECTED] wrote: PS Do you now that by cvs checkout your_project in another directory you are now longer reported by cvs editors despite you have files open for editing with command cvs edit in first directory. If you're not reported by cvs editors for what you have cvs edited, then that's a bug. If it doesn't report you as an editor for a file you haven't cvs edited, then that's normal behavior. We need more serious accounting in version control software. Alternately, we need version control people who understand what version control can and cannot do. Example: Example in Linux RedHat 8.0 cvs version is 1.11.2 shell is /bin/ksh /home/bogdan cvs watch on a_ui /home/bogdan mkdir test1 /home/bogdan cd test1 /home/bogdan/test1 cvs checkout a_ui cvs checkout: Updating a_ui U a_ui/exls.bpr U a_ui/exls.cpp U a_ui/exls.dsk U a_ui/exls.res U a_ui/main.cpp U a_ui/main.dfm U a_ui/main.h /home/bogdan/test1 cd a_ui /home/bogdan/test1/a_ui cvs editors a_ui/main.cpp bg Thu Oct 31 20:21:45 2002 GMTabc1 /home/bg/src/a_ui /home/bogdan/test1/a_ui cvs edit main.* /home/bogdan/test1/a_ui cvs editors main.cppbg Thu Oct 31 20:21:45 2002 GMTabc1 /home/bg/src/a_ui bogdan Fri Nov 1 20:23:24 2002 GMTabc1 /home/bogdan/test1/a_ui main.dfmbogdan Fri Nov 1 20:23:24 2002 GMTabc1 /home/bogdan/test1/a_ui main.h bogdan Fri Nov 1 20:23:24 2002 GMTabc1 /home/bogdan/test1/a_ui /home/bogdan/test1/a_ui cd /home/bogdan mkdir test2 /home/bogdan cd test2 /home/bogdan/test2 cvs checkout a_ui cvs checkout: Updating a_ui U a_ui/exls.bpr U a_ui/exls.cpp U a_ui/exls.dsk U a_ui/exls.res U a_ui/main.cpp U a_ui/main.dfm U a_ui/main.h /home/bogdan/test2 cd a_ui /home/bogdan/test2/a_ui cvs editors a_ui/main.cpp bg Thu Oct 31 20:21:45 2002 GMTabc1 /home/bg/src/a_ui /home/bogdan/test2/a_ui cd ../../test1/a_ui /home/bogdan/test1/a_ui cvs editors a_ui/main.cpp bg Thu Oct 31 20:21:45 2002 GMTabc1 /home/bg/src/a_ui /home/bogdan/test1/a_ui Bogdan ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Linex need serious concurent version control software?
On 1 Nov 2002, Bogdan wrote: I just wander if cvs can make merging kylix project files? My guess is that it will make a mess. Why don't you verify your hypothesis yourself before wasting everyone's time? Maybe Kylix project files *are* mergeable; if that is the case, then there had been no reason for you to write this complaint. Don't assume that everyone knows Kylix, and the format of its project files. Cvs version 1.11.2 is not capable of during that selective restriction. I think there is a time to write serious version control that will allow using Kylix by more then one person for programming. Or maybe it's time to use serious, intelligently designed programming tools that don't use braindamaged file formats. I think this is impossible with cvs, and we need better tool. So go buy it. There are plenty of CM products for Linux, proprietary and non-proprietary. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
