/[cvs]/ccvs/doc/cvs.texinfo
ViewVC logotype

Diff of /ccvs/doc/cvs.texinfo

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.545.2.47 by dprice, Fri Aug 12 20:42:43 2005 UTC revision 1.545.2.48 by dprice, Mon Aug 22 20:28:32 2005 UTC
# Line 5945  these options, see @ref{Invoking CVS}. Line 5945  these options, see @ref{Invoking CVS}.
5945  @cindex Merging a file  @cindex Merging a file
5946  @cindex Update, introduction  @cindex Update, introduction
5947    
5948  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}
5949  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
5950  to a @code{checkout} command: the newest revision of the file is  to a @code{checkout} command: the newest revision of the file is
5951  extracted from the repository and put in your working directory.  extracted from the repository and put in your working directory.  The
5952    @code{-d} option, not necessary with @code{checkout}, tells @sc{cvs}
5953    that you wish it to create directories added by other developers.
5954    
5955  Your modifications to a file are never lost when you  Your modifications to a file are never lost when you
5956  use @code{update}.  If no newer revision exists,  use @code{update}.  If no newer revision exists,

Legend:
Removed from v.1.545.2.47  
changed lines
  Added in v.1.545.2.48

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26