# # # patch "monotone.texi" # from [3f0bb411e9eac311ccfd0a8d895f1a200f2f61d6] # to [d62e740d5bf36c317e4ec3fea155132bd7ba702d] # ============================================================ --- monotone.texi 3f0bb411e9eac311ccfd0a8d895f1a200f2f61d6 +++ monotone.texi d62e740d5bf36c317e4ec3fea155132bd7ba702d @@ -3826,7 +3826,7 @@ any added entries inserted in its manifest. address@hidden monotone drop @var{pathname...} address@hidden monotone [--execute] drop @var{pathname...} @itemx monotone drop --missing This command places ``drop'' entries for the paths specified in @var{pathname...} in the workspace's ``work list''. The work list of @@ -3850,6 +3850,10 @@ you should run @command{drop}, and then perform the actual delete using whatever mechanism you normally use to delete files. +The option @option{--execute} will make ``drop'' perform the actual +deletion operations in the filesystem. It will ignore files or +directories which have already been deleted. + @item monotone [--execute] rename @var{src} @var{dst} @itemx monotone [--execute] rename @var{src1} @var{...} @var{dst/} This command places ``rename'' entries for the paths specified in @@ -4012,6 +4016,35 @@ in inodeprints mode, and that the inodeprints cache is accurate and up to date. address@hidden monotone pivot_root [--execute] pivot_root @var{new_root} @var{put_old} +Most users will never need this command. It is primarily useful in +certain tricky cases where one wishes to combine several projects +into one, or split one project into several. + +Its effect is to rename the directory whose name is currently address@hidden to become the root directory of the versioned tree, and +to at the same time rename the directory that is currently the root of +the versioned tree to have the name @var{put_old}. Conceptually, it +is equivalent to executing the following commands in the root of the +workspace: + address@hidden address@hidden +$ monotone rename . @var{new_root}/@var{put_old} +$ monotone rename @var{new_root} . address@hidden group address@hidden smallexample + +Except, of course, that these @command{rename} commands are illegal, +because after the first command the tree has no root at all, and there +is a directory loop. This illegality is the only reason for address@hidden's existence; internally, the result is treated +exactly like two renames, including with respect to merges and +updates. + +The use of @option{--execute} with this command is strongly +recommended, though not required. + @end ftable @page