233 |
on the same project. It is all too easy to overwrite |
on the same project. It is all too easy to overwrite |
234 |
each others' changes unless you are extremely careful. |
each others' changes unless you are extremely careful. |
235 |
Some editors, like @sc{gnu} Emacs, try to make sure that |
Some editors, like @sc{gnu} Emacs, try to make sure that |
236 |
the same file is never modified by two people at the |
two people never modify the same file at the |
237 |
same time. Unfortunately, if someone is using another |
same time. Unfortunately, if someone is using another |
238 |
editor, that safeguard will not work. @sc{cvs} solves this problem |
editor, that safeguard will not work. @sc{cvs} solves this problem |
239 |
by insulating the different developers from each other. Every |
by insulating the different developers from each other. Every |
6255 |
@cindex Merging a file |
@cindex Merging a file |
6256 |
@cindex Update, introduction |
@cindex Update, introduction |
6257 |
|
|
6258 |
When you want to update or merge a file, use the @code{update} |
When you want to update or merge a file, use the @code{cvs update -d} |
6259 |
command. For files that are not up to date this is roughly equivalent |
command. For files that are not up to date this is roughly equivalent |
6260 |
to a @code{checkout} command: the newest revision of the file is |
to a @code{checkout} command: the newest revision of the file is |
6261 |
extracted from the repository and put in your working directory. |
extracted from the repository and put in your working directory. The |
6262 |
|
@code{-d} option, not necessary with @code{checkout}, tells @sc{cvs} |
6263 |
|
that you wish it to create directories added by other developers. |
6264 |
|
|
6265 |
Your modifications to a file are never lost when you |
Your modifications to a file are never lost when you |
6266 |
use @code{update}. If no newer revision exists, |
use @code{update}. If no newer revision exists, |