# # patch "monotone.texi" # from [1aeed06f449777514c37695ac96ec281a63f6bc9] # to [535a5e96ada08ef284030b84f77d88016964174d] # ======================================================================== --- monotone.texi 1aeed06f449777514c37695ac96ec281a63f6bc9 +++ monotone.texi 535a5e96ada08ef284030b84f77d88016964174d @@ -3060,7 +3060,8 @@ You can experiment with bigger reworkings without putting them on the server. @end itemize -How to use it: address@hidden How to use it: address@hidden Change your working directory to the topmost directory of a CVS project and enter @@ -3120,7 +3121,8 @@ If you change into your working directory you can omit specifying the branch as usual. -Design Goals address@hidden address@hidden Design Goals @itemize @item @@ -3132,7 +3134,7 @@ possible (though this might get confusing and inconvenient). @end itemize -Shortcomings address@hidden Shortcomings @itemize @item @@ -3153,7 +3155,7 @@ no project creation on a CVS server (initial import) @end itemize -Advanced Use: address@hidden Advanced Use: @itemize @item @@ -3163,7 +3165,7 @@ implemented) @end itemize -Future directions: address@hidden Future directions: Perhaps multiple repository pull (mass update) in one command. @@ -3824,6 +3826,11 @@ in inodeprints mode, and that the inodeprints cache is accurate and up to date. address@hidden monotone [--branch @var{destination}] cvs_takeover address@hidden +Imports a CVS checkout into a monotone database for future editing. If files +were locally changed this creates two revisions. +See also @xref{cvssync,,cvssync introduction}. + @end ftable @page @@ -3909,6 +3916,11 @@ in case someone, for some odd reason, decides to put a ``*'' into their branch name. address@hidden monotone cvs_pull [--since @var{time}] [--cvsbranch @var{branch}] address@hidden @var{module}] address@hidden monotone cvs_push [--since @var{time}] [--cvsbranch @var{branch}] address@hidden @var{module}] +These commands communicate with a CVS server. @code{cvs_pull} works like address@hidden update} and @code{cvs_push} is like @code{cvs commit}. +See also @xref{cvssync,,cvssync introduction}. @end ftable @@ -7105,6 +7117,15 @@ debugging; use cvs_import. @comment TROFF INPUT: .TP address@hidden @b{cvs_pull} @i{[--since=time]} @i{[--cvsbranch=branch]} @i{[repository module]} +Import revisions from a CVS server + address@hidden @b{cvs_push} @i{[--cvsbranch=branch]} @i{[repository module]} +Commit revisions to a CVS server + address@hidden @b{cvs_takeover} @i{[module]} +Put a CVS working directory under monotone's control. + @item @b{checkout} @i{[--revision=revision-id]} @i{[]} @itemx @b{co} @i{[--revision=revision-id]} @i{[]} Check out revision from database, into directory.