minirst: support containers Text can be grouped into generic containers in reStructuredText: .. container:: foo This is text inside a "foo" container. .. container:: bar This is nested inside two containers. The minirst parser now recognizes these containers. The containers are either pruned completely from the output (included all nested blocks) or they are simply un-indented. So if 'foo' and 'bar' containers are kept, the above example will result in: This is text inside a "foo" container. This is nested inside two containers. If only 'foo' containers are kept, we get: This is text inside a "foo" container. No output is made if only 'bar' containers are kept. This feature will come in handy for implementing different levels of help output (e.g., verbose and debug level help texts).

     1

#!/bin/sh

     2

     3

hg init repo

     4

cd repo

     5

     6

echo a > a

     7

hg ci -qAm 'add a'

     8

     9

echo b > b

    10

hg ci -qAm 'add b'

    11

    12

hg up -qC 0

    13

hg rm a

    14

hg ci -m 'rm a'

    15

    16

hg up -qC 1

    17

rm a

    18

    19

echo '% local deleted a file, remote removed'

    20

hg merge # should fail, since there are deleted files

    21

hg -v merge --force

    22

echo % should show a as removed

    23

hg st

    24

    25

hg ci -m merge

    26

echo % manifest. should not have a:

    27

hg manifest