# # # patch "monotone.texi" # from [15d2c02056078f0291a85fbd817f92f0fd540a3a] # to [ed56eeb5f4c614e79175cf36e8d3c3352d052913] # ============================================================ --- monotone.texi 15d2c02056078f0291a85fbd817f92f0fd540a3a +++ monotone.texi ed56eeb5f4c614e79175cf36e8d3c3352d052913 @@ -32,7 +32,7 @@ Copyright @copyright{} 2005, 2006 Daniel Carosone @* Copyright @copyright{} 2006 Jeronimo Pellegrini @* Copyright @copyright{} 2006 Alex Queiroz @* -Copyright @copyright{} 2006 William Uther @* +Copyright @copyright{} 2006, 2007 William Uther @* All rights reserved Licensed to the public under the terms of the GNU FDL (>= 1.1). See the file COPYING for details @@ -2306,6 +2306,31 @@ @section Branching and Merging Whatever arrangement of branches you come up with, though, monotone should be able to handle it. +If you are unsure of the name of a branch, you can list all branches using +the @command{ls branches} command. This is very useful, but if you create +a lot of branches then the list can become very long and unwieldy. To help +this monotone has the @command{suspend} command which partially hides +revisions/branches you are no longer using. Further commits on hidden branches +will automatically unhide the branches. + +For example, if Beth is now finished with the muffins branch, she can stop +it from cluttering the list of branches by suspending the last revision in +that branch: + address@hidden address@hidden +$ mtn ls branches +jp.co.juicebot.jb7 +jp.co.juicebot.jb7.muffins +$ mtn heads +mtn: branch 'jp.co.juicebot.jb7.muffins' is currently merged: +4e48e2c9a3d2ca8a708cb0cc545700544efb5021 beth@@juicebot.co.jp 2007-07-08T02:17:37 +$ mtn suspend 4e48e2c9a3d2ca8a708cb0cc545700544efb5021 +$ mtn ls branches +jp.co.juicebot.jb7 address@hidden group address@hidden smallexample + @page @node Network Service Revisited @section Network Service Revisited @@ -3329,6 +3354,14 @@ @section Reserved Certs may be used as an additional heuristic or selection criterion in other commands in the future. address@hidden suspend +This cert's value is the name of a branch (see the @code{branch} cert). +This cert is generated by the @command{suspend} command. A suspended +revision is removed from the list of head revisions of a branch in most +cases. A branch with all its heads suspended will not appear in the +list of branches. Suspended revisions can still have children, and those +children are in no way affected by the suspend cert on their parent. + @item tag This cert's value is a symbolic name given to a revision, which may be used as a way of selecting the revision by name for later commands like @@ -5194,7 +5227,13 @@ @section Certificate comment @var{comment}}. If @var{comment} is not provided, it is read from @code{stdin}. address@hidden mtn suspend @var{id} +This command is a synonym for @command{mtn cert @var{id} suspend address@hidden where @var{branchname} is the current branch name +(either deduced from the workspace or from the @option{--branch} +option). + @item mtn tag @var{id} @var{tagname} This command associates the symbolic name @var{tagname} with the