[PATCH v2] update: teach hg to override untracked dir with a tracked file on update

[Yuya Nishihara]

On Thu, 30 Jun 2016 14:51:07 -0700, Kostia Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia at fb.com>
> # Date 1467323089 25200
> #      Thu Jun 30 14:44:49 2016 -0700
> # Node ID 51c1f0ae6dc4855e213b7ce49acc8010d5505a3f
> # Parent  33a6b750b5b9e0cc193ae0103420dc80af074352
> update: teach hg to override untracked dir with a tracked file on update

> +++ b/tests/test-merge1.t
> @@ -26,10 +26,7 @@
>  
>  Test interrupted updates by exploiting our non-handling of directory collisions
>  
> -  $ mkdir b
> -  $ hg up
> -  abort: *: '$TESTTMP/t/b' (glob)
> -  [255]
> +  $ echo somethingsomething > .hg/updatestate

It doesn't agree with the comment above, and I slightly prefer making a real
interrupted update instead of mocking the .hg directory. It could be

  $ touch b/nonempty