Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 15037:df47381b41d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minirst: add simple table support This adds a subset of the 'simple table' support from RST to allow formatting of options lists through RST. Table columns are automatically sized based on contents, with line wrapping in the last column.
author Matt Mackall <mpm@selenic.com>
date Thu, 11 Aug 2011 22:05:57 -0500
parents 157a294444b2
children 0bb0f807dfc3
comparison
equal deleted inserted replaced
15036:bb96e12a3242 15037:df47381b41d6
3948 3948
3949 The following table details the behavior of remove for different 3949 The following table details the behavior of remove for different
3950 file states (columns) and option combinations (rows). The file 3950 file states (columns) and option combinations (rows). The file
3951 states are Added [A], Clean [C], Modified [M] and Missing [!] (as 3951 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
3952 reported by :hg:`status`). The actions are Warn, Remove (from 3952 reported by :hg:`status`). The actions are Warn, Remove (from
3953 branch) and Delete (from disk):: 3953 branch) and Delete (from disk):
3954 3954
3955 A C M ! 3955 ======= == == == ==
3956 none W RD W R 3956 A C M !
3957 -f R RD RD R 3957 ======= == == == ==
3958 -A W W W R 3958 none W RD W R
3959 -Af R R R R 3959 -f R RD RD R
3960 -A W W W R
3961 -Af R R R R
3962 ======= == == == ==
3960 3963
3961 Note that remove never deletes files in Added [A] state from the 3964 Note that remove never deletes files in Added [A] state from the
3962 working directory, not even if option --force is specified. 3965 working directory, not even if option --force is specified.
3963 3966
3964 This command schedules the files to be removed at the next commit. 3967 This command schedules the files to be removed at the next commit.