| 1 |
swift 08/05/19 19:45:31 |
| 2 |
|
| 3 |
Modified: cvs-tutorial.xml |
| 4 |
Log: |
| 5 |
Coding style, removing traling whitespace |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.19 xml/htdocs/doc/en/cvs-tutorial.xml |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/cvs-tutorial.xml?rev=1.19&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/cvs-tutorial.xml?rev=1.19&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/cvs-tutorial.xml?r1=1.18&r2=1.19 |
| 13 |
|
| 14 |
Index: cvs-tutorial.xml |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/cvs-tutorial.xml,v |
| 17 |
retrieving revision 1.18 |
| 18 |
retrieving revision 1.19 |
| 19 |
diff -u -r1.18 -r1.19 |
| 20 |
--- cvs-tutorial.xml 23 May 2005 12:06:22 -0000 1.18 |
| 21 |
+++ cvs-tutorial.xml 19 May 2008 19:45:31 -0000 1.19 |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
<?xml version="1.0" encoding="UTF-8"?> |
| 24 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/cvs-tutorial.xml,v 1.18 2005/05/23 12:06:22 neysx Exp $ --> |
| 25 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/cvs-tutorial.xml,v 1.19 2008/05/19 19:45:31 swift Exp $ --> |
| 26 |
|
| 27 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
| 28 |
|
| 29 |
@@ -120,9 +120,9 @@ |
| 30 |
first is that in order to connect to a CVS repository, you first need to know a |
| 31 |
path called the "CVSROOT". The CVSROOT is a string, like a URL, that tells |
| 32 |
the cvs command where the remote repository is and how we'd like to connect to |
| 33 |
-it. Just to make things interesting, CVS has a number of CVSROOT formats, |
| 34 |
-depending on whether the CVS repository is local or remote and what method |
| 35 |
-you're going to use to connect to it. Here are some example CVSROOTs, along |
| 36 |
+it. Just to make things interesting, CVS has a number of CVSROOT formats, |
| 37 |
+depending on whether the CVS repository is local or remote and what method |
| 38 |
+you're going to use to connect to it. Here are some example CVSROOTs, along |
| 39 |
with explanations... |
| 40 |
</p> |
| 41 |
|
| 42 |
@@ -229,7 +229,7 @@ |
| 43 |
|
| 44 |
<p> |
| 45 |
Here are the commands needed to get a current copy of the developer sources. |
| 46 |
-You may want to jump forward to the next panel to read the explanation of |
| 47 |
+You may want to jump forward to the next panel to read the explanation of |
| 48 |
these commands, and then jump back here: |
| 49 |
</p> |
| 50 |
|
| 51 |
@@ -259,7 +259,7 @@ |
| 52 |
CVS client to check out ("co") the samba module using a gzip compression level |
| 53 |
of 5 ("-z5") to speed up the transfer over a slow link. For every new file |
| 54 |
that is created locally, cvs prints out a "U [path]" indicating that this |
| 55 |
-particular file has been updated on disk. |
| 56 |
+particular file has been updated on disk. |
| 57 |
</p> |
| 58 |
|
| 59 |
</body> |
| 60 |
@@ -269,13 +269,13 @@ |
| 61 |
<body> |
| 62 |
|
| 63 |
<p> |
| 64 |
-Once the checkout command completes, you'll see a "samba" directory in your |
| 65 |
-current working directory that contains the latest sources. You'll also notice |
| 66 |
-that all the directories have a "CVS" directory inside them -- CVS stores |
| 67 |
+Once the checkout command completes, you'll see a "samba" directory in your |
| 68 |
+current working directory that contains the latest sources. You'll also notice |
| 69 |
+that all the directories have a "CVS" directory inside them -- CVS stores |
| 70 |
accounting information inside these directories, and they can safely be ignored. |
| 71 |
-From this point forward, we don't need to worry about having the CVSROOT |
| 72 |
-environment variable set nor do we need to specify it on the command line |
| 73 |
-because it's now cached inside all those extra "CVS" directories. Remember -- |
| 74 |
+From this point forward, we don't need to worry about having the CVSROOT |
| 75 |
+environment variable set nor do we need to specify it on the command line |
| 76 |
+because it's now cached inside all those extra "CVS" directories. Remember -- |
| 77 |
you only need to have the CVSROOT set for the initial login and checkout. |
| 78 |
</p> |
| 79 |
|
| 80 |
@@ -323,10 +323,10 @@ |
| 81 |
<body> |
| 82 |
|
| 83 |
<p> |
| 84 |
-Also, notice the two command-line options we used for "cvs update". "-d" tells |
| 85 |
-cvs to create any new directories that may have been added to the repository |
| 86 |
-(this doesn't happen by default), and "-P" tells cvs to remove any empty |
| 87 |
-directories from your locally checked-out copy of the sources. "-P" is a good |
| 88 |
+Also, notice the two command-line options we used for "cvs update". "-d" tells |
| 89 |
+cvs to create any new directories that may have been added to the repository |
| 90 |
+(this doesn't happen by default), and "-P" tells cvs to remove any empty |
| 91 |
+directories from your locally checked-out copy of the sources. "-P" is a good |
| 92 |
idea, because cvs has a tendency to collect a lot of empty (once used, but now |
| 93 |
abandoned) directory trees over time. |
| 94 |
</p> |
| 95 |
@@ -371,16 +371,16 @@ |
| 96 |
current version in the repository -- but what happens to the changes you've |
| 97 |
made? Don't worry, they aren't thrown away. If another developer made changes |
| 98 |
to a file that you haven't touched, your local file will be updated so that |
| 99 |
-it's in-sync with the version on the repository. |
| 100 |
+it's in-sync with the version on the repository. |
| 101 |
</p> |
| 102 |
|
| 103 |
<p> |
| 104 |
-And, if you modified lines 1-10 of a local file, and another developer deleted |
| 105 |
+And, if you modified lines 1-10 of a local file, and another developer deleted |
| 106 |
lines 40-50, added 12 new lines at the end of the file, modified lines 30-40 and |
| 107 |
-then committed their changes to the repository before you, cvs will |
| 108 |
-intelligently merge these changes into your locally modified copy so that none |
| 109 |
-of your changes are lost. This allows two or more developers to work on |
| 110 |
-different parts of the same file at the same time. |
| 111 |
+then committed their changes to the repository before you, cvs will |
| 112 |
+intelligently merge these changes into your locally modified copy so that none |
| 113 |
+of your changes are lost. This allows two or more developers to work on |
| 114 |
+different parts of the same file at the same time. |
| 115 |
</p> |
| 116 |
|
| 117 |
</body> |
| 118 |
@@ -438,7 +438,7 @@ |
| 119 |
|
| 120 |
<p> |
| 121 |
It's really easy to view the complete history of a particular file, along |
| 122 |
-with any comments that the developers (including you) may have made when |
| 123 |
+with any comments that the developers (including you) may have made when |
| 124 |
committing. To view this information, type: |
| 125 |
</p> |
| 126 |
|
| 127 |
@@ -462,9 +462,9 @@ |
| 128 |
<body> |
| 129 |
|
| 130 |
<p> |
| 131 |
-You may want to use another editor than the one cvs starts by default when you |
| 132 |
+You may want to use another editor than the one cvs starts by default when you |
| 133 |
type "cvs commit". If so, simply set the EDITOR environment variable to the name |
| 134 |
-of the editor you want to use. Putting a setting such as this one in your |
| 135 |
+of the editor you want to use. Putting a setting such as this one in your |
| 136 |
<path>~/.bashrc</path> would be a good idea: |
| 137 |
</p> |
| 138 |
|
| 139 |
@@ -473,7 +473,7 @@ |
| 140 |
</pre> |
| 141 |
|
| 142 |
<p> |
| 143 |
-Alternatively, you can also specify a log message as a command line option so |
| 144 |
+Alternatively, you can also specify a log message as a command line option so |
| 145 |
that cvs doesn't need to load up an editor in the first place: |
| 146 |
</p> |
| 147 |
|
| 148 |
@@ -489,14 +489,14 @@ |
| 149 |
|
| 150 |
<p> |
| 151 |
Before we continue looking at more cvs commands, I recommend setting up a |
| 152 |
-<path>~/.cvsrc</path> file. By creating a <path>.cvsrc</path> file in your |
| 153 |
-home directory, you can tell cvs to use preferred command-line options by |
| 154 |
-default so that you don't have to remember to type them in each time. Here's a |
| 155 |
+<path>~/.cvsrc</path> file. By creating a <path>.cvsrc</path> file in your |
| 156 |
+home directory, you can tell cvs to use preferred command-line options by |
| 157 |
+default so that you don't have to remember to type them in each time. Here's a |
| 158 |
recommended default <path>.cvsrc</path> file: |
| 159 |
</p> |
| 160 |
|
| 161 |
<pre caption="Recommended defaults"> |
| 162 |
-cvs -q |
| 163 |
+cvs -q |
| 164 |
diff -u -b -B |
| 165 |
checkout -P |
| 166 |
update -d -P |
| 167 |
@@ -510,9 +510,9 @@ |
| 168 |
|
| 169 |
<p> |
| 170 |
In addition to setting useful options for a bunch of cvs commands, the first |
| 171 |
-line of the <path>.cvsrc</path> puts cvs into quiet mode, which has the primary |
| 172 |
+line of the <path>.cvsrc</path> puts cvs into quiet mode, which has the primary |
| 173 |
benefit of making the <c>cvs update</c> output more consise and readable. Also, |
| 174 |
-once you have this .cvsrc in place, you can type <c>cvs update</c> instead of |
| 175 |
+once you have this .cvsrc in place, you can type <c>cvs update</c> instead of |
| 176 |
typing <c>cvs update -dP</c>. |
| 177 |
</p> |
| 178 |
|
| 179 |
@@ -523,7 +523,7 @@ |
| 180 |
<body> |
| 181 |
|
| 182 |
<p> |
| 183 |
-It's really easy to add a source file to CVS. First, create the file with your |
| 184 |
+It's really easy to add a source file to CVS. First, create the file with your |
| 185 |
favorite text editor. Then, type the following: |
| 186 |
</p> |
| 187 |
|
| 188 |
@@ -576,7 +576,7 @@ |
| 189 |
<pre caption="Adding a file, but receive a failure"> |
| 190 |
# <i>cvs add myfile.c</i> |
| 191 |
cvs add: cannot open CVS/Entries for reading: No such file or directory |
| 192 |
-cvs [add aborted]: no repository |
| 193 |
+cvs [add aborted]: no repository |
| 194 |
</pre> |
| 195 |
|
| 196 |
</body> |
| 197 |
@@ -587,9 +587,9 @@ |
| 198 |
|
| 199 |
<p> |
| 200 |
Before we take a look at how to resolve conflicts, let's get familiar with the |
| 201 |
-output of the "cvs update" command. If you created a ~/.cvsrc file that |
| 202 |
-contains a "cvs -q" line, you'll find "cvs update" output a lot easier to read. |
| 203 |
-"cvs update" informs you of what it does and sees by printing out a single |
| 204 |
+output of the "cvs update" command. If you created a ~/.cvsrc file that |
| 205 |
+contains a "cvs -q" line, you'll find "cvs update" output a lot easier to read. |
| 206 |
+"cvs update" informs you of what it does and sees by printing out a single |
| 207 |
character, a space, and a filename; as an example: |
| 208 |
</p> |
| 209 |
|
| 210 |
@@ -597,7 +597,7 @@ |
| 211 |
# <i>cvs update -dP</i> |
| 212 |
? distfiles |
| 213 |
? packages |
| 214 |
-? profiles |
| 215 |
+? profiles |
| 216 |
</pre> |
| 217 |
|
| 218 |
</body> |
| 219 |
@@ -607,9 +607,9 @@ |
| 220 |
<body> |
| 221 |
|
| 222 |
<p> |
| 223 |
-"cvs update" uses the "?" character to tell you that it doesn't know anything |
| 224 |
+"cvs update" uses the "?" character to tell you that it doesn't know anything |
| 225 |
about these particular files that it finds in the local copy of your repository. |
| 226 |
-They're not officially part of the repository, nor have they been scheduled for |
| 227 |
+They're not officially part of the repository, nor have they been scheduled for |
| 228 |
addition. Here's a list of all the other single-character informational messages |
| 229 |
that CVS uses: |
| 230 |
</p> |
| 231 |
@@ -619,7 +619,7 @@ |
| 232 |
</pre> |
| 233 |
|
| 234 |
<p> |
| 235 |
-Used when a new file is created in your local repository, or an untouched (by |
| 236 |
+Used when a new file is created in your local repository, or an untouched (by |
| 237 |
you) file has been updated. |
| 238 |
</p> |
| 239 |
|
| 240 |
@@ -628,7 +628,7 @@ |
| 241 |
</pre> |
| 242 |
|
| 243 |
<p> |
| 244 |
-This file is scheduled for addition and will be officially added to the |
| 245 |
+This file is scheduled for addition and will be officially added to the |
| 246 |
repository when you do a <c>cvs commit</c>. |
| 247 |
</p> |
| 248 |
|
| 249 |
@@ -643,7 +643,7 @@ |
| 250 |
</pre> |
| 251 |
|
| 252 |
<p> |
| 253 |
-Like "A", an "R" lets you know that this file is scheduled for removal. The |
| 254 |
+Like "A", an "R" lets you know that this file is scheduled for removal. The |
| 255 |
file will be removed from the repository as soon as you <c>cvs commit</c>. |
| 256 |
</p> |
| 257 |
|
| 258 |
@@ -652,7 +652,7 @@ |
| 259 |
</pre> |
| 260 |
|
| 261 |
<p> |
| 262 |
-This means that this file has been modified by you; additionally, it's possible |
| 263 |
+This means that this file has been modified by you; additionally, it's possible |
| 264 |
that new changes from the repository were merged into this file successfully. |
| 265 |
</p> |
| 266 |
|
| 267 |
@@ -661,7 +661,7 @@ |
| 268 |
</pre> |
| 269 |
|
| 270 |
<p> |
| 271 |
-The "C" character indicates that this file has a conflict and requires manual |
| 272 |
+The "C" character indicates that this file has a conflict and requires manual |
| 273 |
fixing before you can "cvs commit" your changes. |
| 274 |
</p> |
| 275 |
|
| 276 |
@@ -677,7 +677,7 @@ |
| 277 |
We developers spend most of our time hacking away at the sources inside the |
| 278 |
"gentoo-x86" module. Inside the gentoo-x86 module, we have a file called |
| 279 |
"ChangeLog" that houses (you guessed it) a description of the major changes we |
| 280 |
-make to the files in the repository. |
| 281 |
+make to the files in the repository. |
| 282 |
</p> |
| 283 |
|
| 284 |
</body> |
| 285 |
@@ -695,21 +695,21 @@ |
| 286 |
|
| 287 |
<pre caption="ChangeLog entry"> |
| 288 |
date 25 Feb 2001 |
| 289 |
- |
| 290 |
+ |
| 291 |
This is the thing I added myself |
| 292 |
</pre> |
| 293 |
|
| 294 |
<p> |
| 295 |
However, let's say that before I'm able to commit these three new lines, another |
| 296 |
-developer adds these lines to the top of the ChangeLog and commits their |
| 297 |
+developer adds these lines to the top of the ChangeLog and commits their |
| 298 |
changes: |
| 299 |
</p> |
| 300 |
|
| 301 |
<pre caption="ChangeLog entry 2"> |
| 302 |
date 25 Feb 2001 |
| 303 |
- |
| 304 |
+ |
| 305 |
This is the part added by another developer |
| 306 |
-</pre> |
| 307 |
+</pre> |
| 308 |
|
| 309 |
|
| 310 |
</body> |
| 311 |
@@ -719,9 +719,9 @@ |
| 312 |
<body> |
| 313 |
|
| 314 |
<p> |
| 315 |
-Now, when I run <c>cvs update -dP</c> (as you should before every commit), cvs |
| 316 |
-isn't able to merge the changes into my local copy of ChangeLog because we |
| 317 |
-both have added lines to the exact same part of the file -- how is cvs to know |
| 318 |
+Now, when I run <c>cvs update -dP</c> (as you should before every commit), cvs |
| 319 |
+isn't able to merge the changes into my local copy of ChangeLog because we |
| 320 |
+both have added lines to the exact same part of the file -- how is cvs to know |
| 321 |
which version to use? So, I get the following error from CVS: |
| 322 |
</p> |
| 323 |
|
| 324 |
@@ -750,14 +750,14 @@ |
| 325 |
<pre caption="ChangeLog conflict"> |
| 326 |
<<<<<<< ChangeLog |
| 327 |
date 25 Feb 2001 |
| 328 |
- |
| 329 |
+ |
| 330 |
This is the thing I added myself |
| 331 |
- |
| 332 |
+ |
| 333 |
======= |
| 334 |
date 25 Feb 2001 |
| 335 |
- |
| 336 |
+ |
| 337 |
This is the part added by another developer |
| 338 |
- |
| 339 |
+ |
| 340 |
>>>>>>> 1.363 |
| 341 |
</pre> |
| 342 |
|
| 343 |
@@ -785,8 +785,8 @@ |
| 344 |
</pre> |
| 345 |
|
| 346 |
<p> |
| 347 |
-Now that I've replaced the conflicting region of the file with the appropriate |
| 348 |
-text (and removed the "=======", etc markers), I can now commit my changes to |
| 349 |
+Now that I've replaced the conflicting region of the file with the appropriate |
| 350 |
+text (and removed the "=======", etc markers), I can now commit my changes to |
| 351 |
cvs without any problems. |
| 352 |
</p> |
| 353 |
|
| 354 |
@@ -803,7 +803,7 @@ |
| 355 |
also obviously very important to remove the special markers that cvs added to |
| 356 |
the conflicting file. Another tip -- if you make a mistake while fixing the |
| 357 |
conflict and then ("D'oh!") accidentally save your changes, you can find an |
| 358 |
-original copy of your version in the file ".#filename.version". |
| 359 |
+original copy of your version in the file ".#filename.version". |
| 360 |
</p> |
| 361 |
|
| 362 |
</body> |
| 363 |
@@ -813,9 +813,9 @@ |
| 364 |
<body> |
| 365 |
|
| 366 |
<p> |
| 367 |
-Now, it's time to learn our final CVS skill -- removing files from the |
| 368 |
-repository. Removing a file is a two-stage process. First, delete the file |
| 369 |
-from your local copy of the sources, and then execute the appropriate <c>cvs |
| 370 |
+Now, it's time to learn our final CVS skill -- removing files from the |
| 371 |
+repository. Removing a file is a two-stage process. First, delete the file |
| 372 |
+from your local copy of the sources, and then execute the appropriate <c>cvs |
| 373 |
remove</c> command: |
| 374 |
</p> |
| 375 |
|
| 376 |
@@ -840,9 +840,9 @@ |
| 377 |
</p> |
| 378 |
|
| 379 |
<p> |
| 380 |
-<c>cvs remove</c> is recursive, which means that you can delete a bunch of |
| 381 |
-files, and then run the <c>cvs remove</c> command with no other arguments from |
| 382 |
-a parent directory. Doing this will cause all of the deleted files to be tagged |
| 383 |
+<c>cvs remove</c> is recursive, which means that you can delete a bunch of |
| 384 |
+files, and then run the <c>cvs remove</c> command with no other arguments from |
| 385 |
+a parent directory. Doing this will cause all of the deleted files to be tagged |
| 386 |
for removal at the next commit. |
| 387 |
</p> |
| 388 |
|
| 389 |
@@ -887,7 +887,7 @@ |
| 390 |
</pre> |
| 391 |
|
| 392 |
<p> |
| 393 |
-Notice that removing the directory didn't require another commit -- directories |
| 394 |
+Notice that removing the directory didn't require another commit -- directories |
| 395 |
are added to and removed from the repository in real-time. |
| 396 |
</p> |
| 397 |
|
| 398 |
@@ -898,26 +898,26 @@ |
| 399 |
<body> |
| 400 |
|
| 401 |
<p> |
| 402 |
-Your introduction to CVS is complete -- I hope that this tutorial has been |
| 403 |
-helpful. There's much more to CVS than I've been able to cover in this |
| 404 |
-introductory tutorial, but thankfully there are a bunch of great CVS resources |
| 405 |
-you can use to further expand your CVS knowledge: |
| 406 |
+Your introduction to CVS is complete -- I hope that this tutorial has been |
| 407 |
+helpful. There's much more to CVS than I've been able to cover in this |
| 408 |
+introductory tutorial, but thankfully there are a bunch of great CVS resources |
| 409 |
+you can use to further expand your CVS knowledge: |
| 410 |
</p> |
| 411 |
|
| 412 |
<ul> |
| 413 |
<li> |
| 414 |
<uri>http://www.cvshome.org</uri> is the home of CVS development, |
| 415 |
- and offers a bunch of documentation on CVS, including the <uri |
| 416 |
- link="http://www.cvshome.org/docs/manual">official CVS |
| 417 |
+ and offers a bunch of documentation on CVS, including the <uri |
| 418 |
+ link="http://www.cvshome.org/docs/manual">official CVS |
| 419 |
documentation online</uri> |
| 420 |
</li> |
| 421 |
<li> |
| 422 |
- The <uri link="http://www.durak.org/cvswebsites/">CVS Version Control for |
| 423 |
+ The <uri link="http://www.durak.org/cvswebsites/">CVS Version Control for |
| 424 |
Web Site Projects site</uri> has good info on how to use CVS for developing |
| 425 |
web sites |
| 426 |
</li> |
| 427 |
<li> |
| 428 |
- Karl Fogel has written a book called <uri |
| 429 |
+ Karl Fogel has written a book called <uri |
| 430 |
link="http://cvsbook.red-bean.com/">Open Source Development with CVS</uri>. |
| 431 |
A number of chapters are available for free from the website. |
| 432 |
</li> |
| 433 |
@@ -927,7 +927,7 @@ |
| 434 |
repository; excellent for browsing. |
| 435 |
</li> |
| 436 |
<li> |
| 437 |
- The <uri link="http://www.loria.fr/~molli/cvs-index.html">CVS Bubbles</uri> |
| 438 |
+ The <uri link="http://www.loria.fr/~molli/cvs-index.html">CVS Bubbles</uri> |
| 439 |
site has a bunch of good resources including a CVS FAQ-o-matic. |
| 440 |
</li> |
| 441 |
</ul> |
| 442 |
|
| 443 |
|
| 444 |
|
| 445 |
-- |
| 446 |
gentoo-doc-cvs@l.g.o mailing list |
Archives