139   $ hg up -C

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

   141 

   142 forget and get should have the right order: added but missing dir should be

   143 forgotten before file with same name is added

   144 

   145   $ echo file d > d

   146   $ hg add d

   147   $ hg ci -md

   148   $ hg rm d

   149   $ mkdir d

   150   $ echo a > d/a

   151   $ hg add d/a

   152   $ rm -r d

   153   $ hg up -C

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

   155   $ cat d

   156   file d