1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
|
This is Info file cvs.info, produced by Makeinfo-1.55 from the input
file ./cvs.texinfo.
Copyright (C) 1992, 1993 Signum Support AB Copyright (C) 1993, 1994
Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice are
preserved on all copies.
Permission is granted to copy and distribute modified versions of
this manual under the conditions for verbatim copying, provided also
that the section entitled "GNU General Public License" is included
exactly as in the original, and provided that the entire resulting
derived work is distributed under the terms of a permission notice
identical to this one.
Permission is granted to copy and distribute translations of this
manual into another language, under the above conditions for modified
versions, except that the section entitled "GNU General Public License"
and this permission notice may be included in translations approved by
the Free Software Foundation instead of in the original English.
File: cvs.info, Node: Index, Prev: Copying, Up: Top
Index
*****
If you cannot find what you are looking for here write to
<ceder@signum.se> so that an entry can be added to the next release of
this manual.
* Menu:
* -j (merging branches): Merging a branch.
* -k (RCS kflags): Substitution modes.
* .bashrc: Repository.
* .cshrc: Repository.
* .cvsrc file: ~/.cvsrc.
* .profile: Repository.
* .tcshrc: Repository.
* /usr/local/cvsroot: Repository.
* <<<<<<<: Conflicts example.
* =======: Conflicts example.
* >>>>>>>: Conflicts example.
* A sample session: A sample session.
* About this manual: Preface.
* Add (subcommand): add.
* Add options: add options.
* Adding a tag: Tags.
* Adding files: Adding files.
* Admin (subcommand): admin.
* Administrative files (intro): Intro administrative files.
* Administrative files (reference): Administrative files.
* Administrative files, editing them: Intro administrative files.
* ALL in commitinfo: commitinfo.
* Author keyword: Keyword list.
* Automatically ignored files: cvsignore.
* Avoiding editor invocation: Common options.
* Binary files (inhibit keyword expansion): admin examples.
* Branch merge example: Merging a branch.
* Branch number: Revision numbers.
* Branch numbers: Creating a branch.
* Branch, creating a: Creating a branch.
* Branch, vendor-: Tracking sources.
* Branches: Branches.
* Branches motivation: Branches motivation.
* Branches, copying changes between: Merging.
* Branches, sticky: Sticky tags.
* Bringing a file up to date: Updating a file.
* Bugs, known in this manual: BUGS.
* Bugs, reporting (manual): BUGS.
* Changes, copying between branches: Merging.
* Changing a log message: admin options.
* Checkin program: modules.
* Checking commits: commitinfo.
* Checking out source: Getting the source.
* Checkout (subcommand): checkout.
* Checkout program: modules.
* Checkout, example: Getting the source.
* Cleaning up: Cleaning up.
* Client/Server Operation: Remote repositories.
* Co (subcommand): checkout.
* Command reference: Invoking CVS.
* Command structure: Structure.
* Comment leader: admin examples.
* Commit (subcommand): commit.
* Commit files: commit files.
* Commit, when to: When to commit.
* Commitinfo: commitinfo.
* Committing changes: Committing your changes.
* Common options: Common options.
* Common syntax of info files: syntax.
* Conflict markers: Conflicts example.
* Conflict resolution: Conflicts example.
* Conflicts (merge example): Conflicts example.
* Contributors (CVS program): What is CVS?.
* Contributors (manual): Credits.
* Copying changes: Merging.
* Correcting a log message: admin options.
* Creating a branch: Creating a branch.
* Creating a project: Starting a new project.
* Creating a repository: Setting up.
* Credits (CVS program): What is CVS?.
* Credits (manual): Credits.
* CVS command structure: Structure.
* CVS FAQ: What is CVS?.
* CVS FTP site: What is CVS?.
* CVS, history of: What is CVS?.
* CVS, introduction to: What is CVS?.
* CVSEDITOR: Environment variables.
* CVSEDITOR, environment variable: Committing your changes.
* CVSIGNORE: Environment variables.
* Cvsignore, global: cvsignore.
* CVSREAD: Environment variables.
* CVSREAD, overriding: Global options.
* CVSROOT: Environment variables.
* cvsroot: Repository.
* CVSROOT (file): Administrative files.
* CVSROOT, environment variable: Repository.
* CVSROOT, module name: Intro administrative files.
* CVSROOT, multiple repositories: Multiple repositories.
* CVSROOT, overriding: Global options.
* cvswrappers (admin file): Wrappers.
* CVSWRAPPERS, environment variable: Wrappers.
* Date keyword: Keyword list.
* Dates: Common options.
* Decimal revision number: Revision numbers.
* DEFAULT in commitinfo: commitinfo.
* DEFAULT in editinfo: editinfo.
* Defining a module: Defining the module.
* Defining modules (intro): Intro administrative files.
* Defining modules (reference manual): modules.
* Deleting files: Removing files.
* Deleting revisions: admin options.
* Deleting sticky tags: Sticky tags.
* Descending directories: Recursive behavior.
* Diff: Viewing differences.
* Diff (subcommand): diff.
* Differences, merging: Merging two revisions.
* Directories, moving: Moving directories.
* Directory, descending: Recursive behavior.
* Disjoint repositories: Multiple repositories.
* Distributing log messages: loginfo.
* driver.c (merge example): Conflicts example.
* Editinfo: editinfo.
* Editing administrative files: Intro administrative files.
* Editing the modules file: Defining the module.
* EDITOR: Environment variables.
* Editor, avoiding invocation of: Common options.
* EDITOR, environment variable: Committing your changes.
* EDITOR, overriding: Global options.
* Editor, specifying per module: editinfo.
* emerge: Conflicts example.
* Environment variables: Environment variables.
* Errors, reporting (manual): BUGS.
* Example of a work-session: A sample session.
* Example of merge: Conflicts example.
* Example, branch merge: Merging a branch.
* Export (subcommand): export.
* FAQ: What is CVS?.
* Fetching source: Getting the source.
* File locking: Multiple developers.
* File permissions: File permissions.
* File status: File status.
* Files, moving: Moving files.
* Files, reference manual: Administrative files.
* Fixes to CVS: What is CVS?.
* Fixing a log message: admin options.
* Forcing a tag match: Common options.
* Form for log message: rcsinfo.
* Format of CVS commands: Structure.
* Four states of a file: File status.
* FTP site: What is CVS?.
* Getting started: A sample session.
* Getting the source: Getting the source.
* Global cvsignore: cvsignore.
* Global options: Global options.
* Group: File permissions.
* Header keyword: Keyword list.
* History (subcommand): history.
* History file: history file.
* History files: User modules.
* History of CVS: What is CVS?.
* Id keyword: Keyword list.
* Ident (shell command): Using keywords.
* Identifying files: Keyword substitution.
* Ignored files: cvsignore.
* Ignoring files: cvsignore.
* Import (subcommand): import.
* Importing files: From files.
* Importing modules: First import.
* Index: Index.
* Info files (syntax): syntax.
* Informing others: Informing others.
* Inhibiting keyword expansion: admin examples.
* Introduction to CVS: What is CVS?.
* Invoking CVS: Invoking CVS.
* Join: Merging a branch.
* Keyword expansion: Keyword substitution.
* Keyword expansion, inhibiting: admin examples.
* Keyword substitution: Keyword substitution.
* Kflag: Substitution modes.
* Known bugs in this manual: BUGS.
* Layout of repository: Repository.
* Left-hand options: Global options.
* Linear development: Revision numbers.
* List, mailing list: What is CVS?.
* Locally modified: File status.
* Locker keyword: Keyword list.
* Locking files: Multiple developers.
* Log (subcommand): log.
* Log information, saving: history file.
* Log keyword: Keyword list.
* Log keyword, selecting comment leader: admin examples.
* Log message entry: Committing your changes.
* Log message template: rcsinfo.
* Log message, correcting: admin options.
* Log messages: loginfo.
* Log messages, editing: editinfo.
* Loginfo: loginfo.
* LOGNAME: Environment variables.
* Mail, automatic mail on commit: Informing others.
* Mailing list: What is CVS?.
* Mailing log messages: loginfo.
* Main trunk (intro): Revision numbers.
* Main trunk and branches: Branches.
* Many repositories: Multiple repositories.
* Markers, conflict: Conflicts example.
* Merge, an example: Conflicts example.
* Merge, branch example: Merging a branch.
* Merging: Merging.
* Merging a branch: Merging a branch.
* Merging a file: Updating a file.
* Merging two revisions: Merging two revisions.
* mkmodules: Intro administrative files.
* Modifications, copying between branches: Merging.
* Module status: modules.
* Module, defining: Defining the module.
* Modules (admin file): modules.
* Modules (intro): Basic concepts.
* Modules file: Intro administrative files.
* Modules file, changing: Defining the module.
* Motivation for branches: Branches motivation.
* Moving directories: Moving directories.
* Moving files: Moving files.
* Multiple developers: Multiple developers.
* Multiple repositories: Multiple repositories.
* Name, symbolic (tag): Tags.
* Needing merge: File status.
* Needing update: File status.
* Nroff (selecting comment leader): admin examples.
* Number, branch: Revision numbers.
* Number, revision-: Revision numbers.
* option defaults: ~/.cvsrc.
* Options, global: Global options.
* Outdating revisions: admin options.
* Overlap: Updating a file.
* Overriding CVSREAD: Global options.
* Overriding CVSROOT: Global options.
* Overriding EDITOR: Global options.
* Overriding RCSBIN: Global options.
* Parallel repositories: Multiple repositories.
* Patches to CVS: What is CVS?.
* PATH: Environment variables.
* Per-module editor: editinfo.
* Policy: When to commit.
* Precommit checking: commitinfo.
* Preface: Preface.
* RCS history files: User modules.
* RCS keywords: Keyword list.
* RCS revision numbers: Tags.
* RCS, CVS uses RCS: User modules.
* RCSBIN: Environment variables.
* RCSBIN, overriding: Global options.
* RCSfile keyword: Keyword list.
* Rcsinfo: rcsinfo.
* RCSINIT: Environment variables.
* Rdiff (subcommand): rdiff.
* Read-only files: Global options.
* Read-only mode: Global options.
* Recursive (directory descending): Recursive behavior.
* Reference manual (files): Administrative files.
* Reference manual for variables: Environment variables.
* Reference, commands: Invoking CVS.
* Release (subcommand): release.
* Releases, revisions and versions: Versions revisions releases.
* Releasing your working copy: Cleaning up.
* Remote repositories: Remote repositories.
* Remove (subcommand): remove.
* Removing a change: Merging two revisions.
* Removing files: Removing files.
* Removing your working copy: Cleaning up.
* Renaming directories: Moving directories.
* Renaming files: Moving files.
* Replacing a log message: admin options.
* Reporting bugs (manual): BUGS.
* Repositories, multiple: Multiple repositories.
* Repositories, remote: Remote repositories.
* Repository (intro): Basic concepts.
* Repository, example: Repository.
* Repository, setting up: Setting up.
* Repository, user parts: User modules.
* Resetting sticky tags: Sticky tags.
* Resolving a conflict: Conflicts example.
* Retrieving an old revision using tags: Tags.
* Revision keyword: Keyword list.
* Revision management: Revision management.
* Revision numbers: Revision numbers.
* Revision tree: Revision numbers.
* Revision tree, making branches: Branches.
* Revisions, merging differences between: Merging two revisions.
* Revisions, versions and releases: Versions revisions releases.
* Right-hand options: Common options.
* Rtag (subcommand): rtag.
* rtag, creating a branch using: Creating a branch.
* Saving space: admin options.
* Security: File permissions.
* setgid: File permissions.
* Setting up a repository: Setting up.
* setuid: File permissions.
* Signum Support: Preface.
* Source keyword: Keyword list.
* Source, getting CVS source: What is CVS?.
* Source, getting from CVS: Getting the source.
* Specifying dates: Common options.
* Spreading information: Informing others.
* Starting a project with CVS: Starting a new project.
* State keyword: Keyword list.
* Status (subcommand): status.
* Status of a file: File status.
* Status of a module: modules.
* Sticky tags: Sticky tags.
* Sticky tags, resetting: Sticky tags.
* Storing log messages: loginfo.
* Structure: Structure.
* Subdirectories: Recursive behavior.
* Support, getting CVS support: Preface.
* Symbolic name (tag): Tags.
* Syntax of info files: syntax.
* Tag (subcommand): tag.
* Tag program: modules.
* tag, command, introduction: Tags.
* tag, example: Tags.
* Tag, retrieving old revisions: Tags.
* Tag, symbolic name: Tags.
* Tags: Tags.
* Tags, sticky: Sticky tags.
* tc, Trivial Compiler (example): A sample session.
* Team of developers: Multiple developers.
* TEMP: Environment variables.
* Template for log message: rcsinfo.
* Third-party sources: Tracking sources.
* Time: Common options.
* TMP: Environment variables.
* TMPDIR: Environment variables.
* Trace: Global options.
* Tracking sources: Tracking sources.
* Trivial Compiler (example): A sample session.
* Typical repository: Repository.
* Undoing a change: Merging two revisions.
* Up-to-date: File status.
* Update (subcommand): update.
* Update program: modules.
* update, introduction: Updating a file.
* Updating a file: Updating a file.
* USER: Environment variables.
* User modules: User modules.
* Vendor: Tracking sources.
* Vendor branch: Tracking sources.
* Versions, revisions and releases: Versions revisions releases.
* Viewing differences: Viewing differences.
* Wdiff (import example): First import.
* What (shell command): Using keywords.
* What branches are good for: Branches motivation.
* What is CVS?: What is CVS?.
* When to commit: When to commit.
* Work-session, example of: A sample session.
* Working copy: Multiple developers.
* Working copy, removing: Cleaning up.
* Wrappers: Wrappers.
|
