173   $ hg st

   173   $ hg st

   174   ? b

   174   ? b

   175   $ hg up 1

   175   $ hg up 1

   176   b: untracked file differs

   176   b: untracked file differs

   177   abort: untracked files in working directory differ from files in requested revision

   177   abort: untracked files in working directory differ from files in requested revision

   179   $ rm b

   179   $ rm b

   180 

   180 

   181 test conflicting untracked ignored file

   181 test conflicting untracked ignored file

   182 

   182 

   183   $ hg up -qC 0

   183   $ hg up -qC 0

   193   $ echo untracked > ignored

   193   $ echo untracked > ignored

   194   $ hg st

   194   $ hg st

   195   $ hg up 'desc("add ignored file")'

   195   $ hg up 'desc("add ignored file")'

   196   ignored: untracked file differs

   196   ignored: untracked file differs

   197   abort: untracked files in working directory differ from files in requested revision

   197   abort: untracked files in working directory differ from files in requested revision

   199 

   199 

   200 test a local add

   200 test a local add

   201 

   201 

   202   $ cd ..

   202   $ cd ..

   203   $ hg init a

   203   $ hg init a