1   $ mkdir r1

     2   $ cd r1

     3   $ hg init

     4   $ mkdir a

     5   $ echo foo > a/f

     6   $ hg add a

     7   adding a/f

     8   $ hg ci -m "a/f == foo"

     9   $ cd ..

    10 

    11   $ hg clone r1 r2

    12   updating to branch default

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

    14   $ cd r2

    15   $ hg mv a b

    16   moving a/f to b/f

    17   $ echo foo1 > b/f

    18   $ hg ci -m" a -> b, b/f == foo1"

    19   $ cd ..

    20 

    21   $ cd r1

    22   $ mkdir a/aa

    23   $ echo bar > a/aa/g

    24   $ hg add a/aa

    25   adding a/aa/g

    26   $ hg ci -m "a/aa/g"

    27   $ hg pull ../r2

    28   pulling from ../r2

    29   searching for changes

    30   adding changesets

    31   adding manifests

    32   adding file changes

    33   added 1 changesets with 1 changes to 1 files (+1 heads)

    34   (run 'hg heads' to see heads, 'hg merge' to merge)

    35 

    36   $ hg merge

    37   2 files updated, 0 files merged, 1 files removed, 0 files unresolved

    38   (branch merge, don't forget to commit)

    39 

    40   $ hg st -C

    41   M b/f

    42   A b/aa/g

    43     a/aa/g

    44   R a/aa/g

    45   R a/f