1   $ hg init

     2 

     3   $ echo "added file1" > file1

     4   $ echo "another line of text" >> file1

     5   $ echo "added file2" > file2

     6   $ hg add file1 file2

     7   $ hg commit -m "added file1 and file2"

     8 

     9   $ echo "changed file1" >> file1

    10   $ hg commit -m "changed file1"

    11 

    12   $ hg -q log

    13   1:dfab7f3c2efb

    14   0:c3fa057dd86f

    15   $ hg id

    16   dfab7f3c2efb tip

    17 

    18   $ hg update -C 0

    19   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    20   $ hg id

    21   c3fa057dd86f

    22 

    23   $ echo "changed file1" >> file1

    24   $ hg id

    25   c3fa057dd86f+

    26 

    27   $ hg revert --no-backup --all

    28   reverting file1

    29   $ hg diff

    30   $ hg status

    31   $ hg id

    32   c3fa057dd86f

    33 

    34   $ hg update

    35   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    36   $ hg diff

    37   $ hg status

    38   $ hg id

    39   dfab7f3c2efb tip

    40 

    41   $ hg update -C 0

    42   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    43   $ echo "changed file1 different" >> file1

    44 

    45   $ hg update

    46   merging file1

    47   warning: conflicts during merge.

    48   merging file1 failed!

    49   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

    50   use 'hg resolve' to retry unresolved file merges

    51 

    52   $ hg diff --nodates

    53   diff -r dfab7f3c2efb file1

    54   --- a/file1

    55   +++ b/file1

    56   @@ -1,3 +1,7 @@

    57    added file1

    58    another line of text

    59   +<<<<<<< local

    60   +changed file1 different

    61   +=======

    62    changed file1

    63   +>>>>>>> other

    64 

    65   $ hg status

    66   M file1

    67   ? file1.orig

    68   $ hg id

    69   dfab7f3c2efb+ tip

    70 

    71   $ hg revert --no-backup --all

    72   reverting file1

    73   $ hg diff

    74   $ hg status

    75   ? file1.orig

    76   $ hg id

    77   dfab7f3c2efb tip

    78 

    79   $ hg revert -r tip --no-backup --all

    80   $ hg diff

    81   $ hg status

    82   ? file1.orig

    83   $ hg id

    84   dfab7f3c2efb tip

    85 

    86   $ hg update -C

    87   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

    88   $ hg diff

    89   $ hg status

    90   ? file1.orig

    91   $ hg id

    92   dfab7f3c2efb tip

    93