63 Change with dirty working directory

    63 Change with dirty working directory

    64 

    64 

    65   $ echo bar > a

    65   $ echo bar > a

    66   $ hg branch -r . foo

    66   $ hg branch -r . foo

    67   abort: uncommitted changes

    67   abort: uncommitted changes

    69 

    69 

    70   $ hg revert --all

    70   $ hg revert --all

    71   reverting a

    71   reverting a

    72 

    72 

    73 Change on empty revision set

    73 Change on empty revision set

   329   $ hg merge -r 28

   329   $ hg merge -r 28

   330   4 files updated, 0 files merged, 0 files removed, 0 files unresolved

   330   4 files updated, 0 files merged, 0 files removed, 0 files unresolved

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

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

   332   $ hg branch -r . abcd

   332   $ hg branch -r . abcd

   333   abort: outstanding uncommitted merge

   333   abort: outstanding uncommitted merge

   335 

   335 

   336   $ hg ci -m "Merge commit"

   336   $ hg ci -m "Merge commit"

   337   $ hg glog -r 'parents(.)::'

   337   $ hg glog -r 'parents(.)::'

   338   @    30:4d56e6b1eb6b Merge commit

   338   @    30:4d56e6b1eb6b Merge commit

   339   |\   default ()

   339   |\   default ()