[Topic Split] Aspects of CVS
Moderator: Board moderators
[Topic Split] Aspects of CVS
Btw my new worldpatch maps made it into CVS. So now there are more maps on the right side of the world.
-
- Forum Aficionado
- Posts: 1994
- Joined: Tue Apr 29, 2003 5:55 pm
- Location: Minnesota, USA
- Contact:
I'm somewhat new to the administration or management side of CVS, so I might not be thorough or accurate in my summary..Rednaxela wrote: *waits for MLAB to be updated in CVS, which is partly taking so long...
The files aren't in a format that makes merging them into the rest of the map files very easy - which also adds to the challenge to make sure that the merged maps don't conflict or break anything, all of which needs to be done before the official commit into CVS.
Since the maps are not in CVS (for the reasons mentioned above), the maps are not receiving the peer review that much of the code receives before being committed to CVS.
Wash, rinse, repeat.

I agree with that yeah, but this statement:

By the way. I don't know how to use CVS myself yet (other than through read-only browsers like the SF one), but I'm interested in learning. What would be a good resource for learning CVS?
does'nt appear to make sence. So you're saying that code gets more review before it's in CVS if it's already in CVS?leaf wrote:Since the maps are not in CVS (for the reasons mentioned above), the maps are not receiving the peer review that much of the code receives before being committed to CVS.

By the way. I don't know how to use CVS myself yet (other than through read-only browsers like the SF one), but I'm interested in learning. What would be a good resource for learning CVS?
-
- Forum Aficionado
- Posts: 1994
- Joined: Tue Apr 29, 2003 5:55 pm
- Location: Minnesota, USA
- Contact:
CVS can allow people an easier way to review, tweak, update, and modify code - which is then checked in - which lets other people approve/reject or review, tweak, update and modify your change(s). All the while the original code base can be accessed or rolled back to.. assuming their is a base code to begin with.Rednaxela wrote:I agree with that yeah, but this statement:does'nt appear to make sence. So you're saying that code gets more review before it's in CVS if it's already in CVS?leaf wrote:Since the maps are not in CVS (for the reasons mentioned above), the maps are not receiving the peer review that much of the code receives before being committed to CVS.
I'm saying patches get more review before they're in CVS if the patch or update is being applied to existing code already in CVS.
-
- Forum Fanatic
- Posts: 852
- Joined: Sun Jun 13, 2004 2:07 am
- Location: Hemel Hempstead
'man cvs' is about as good a place to start as any, although its explanations of CVSROOT are noticable by their absence.
in general though:
to grab from CVS
for the server
for the maps, etc (use the web based browser to see the module names available).
to diff against CVS
other stuff, to merge into the repository the commit command is used, but that is complicated, by which I mean I don't understand it myself 
in general though:
to grab from CVS
Code: Select all
cvs -z9 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/crossfire co crossfire
Code: Select all
cvs -z9 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/crossfire co maps-bigworld
to diff against CVS
Code: Select all
cvs -z9 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/crossfire diff -RC 5 [files and directories to diff]

-
- Forum Fanatic
- Posts: 852
- Joined: Sun Jun 13, 2004 2:07 am
- Location: Hemel Hempstead
Further pokeage turned up this. A quick skim suggests that it falls under the category of 'something I don't know already' (although a hell of a lot falls into that category...) , and that it is about CVS, and that it uses the words 'introduction' and 'basic' a lot (this I consider a good sign as long as the letters VB are nowhere nearby...)
http://sourceforge.net/docman/display_d ... group_id=1
http://sourceforge.net/docman/display_d ... group_id=1
Ah.. So the patch being in the repository but not yet being applied to the files in it. That makes senceleaf wrote:CVS can allow people an easier way to review, tweak, update, and modify code - which is then checked in - which lets other people approve/reject or review, tweak, update and modify your change(s). All the while the original code base can be accessed or rolled back to.. assuming their is a base code to begin with.
I'm saying patches get more review before they're in CVS if the patch or update is being applied to existing code already in CVS.
Lol! Yeahcavesomething wrote:...it uses the words 'introduction' and 'basic' a lot (this I consider a good sign as long as the letters VB are nowhere nearby...)

Thank's for the link

-
- Forum Fanatic
- Posts: 852
- Joined: Sun Jun 13, 2004 2:07 am
- Location: Hemel Hempstead
That isn't how I read leaf's statement, I'm sure he will correct me on this one, but I thought he meant patches where you couldRednaxela wrote:Ah.. So the patch being in the repository but not yet being applied to the files in it. That makes senceleaf wrote: I'm saying patches get more review before they're in CVS if the patch or update is being applied to existing code already in CVS.
cvs co module
cd module
patch -p0 < ../some_patch_file.diff
and then compile and test.