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

Yuya Nishihara yuya at tcha.org
Sun Jul 3 05:49:09 EDT 2016


On Fri, 1 Jul 2016 15:44:22 +0000, Kostiantyn Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia at fb.com>
> # Date 1467387775 -7200
> #      Fri Jul 01 17:42:55 2016 +0200
> # Node ID f9db0a6e3bfd6b980b441a699095fa1db0c46400
> # Parent  5b71a8d7f7ffc2662ceb58ad8eec806e147ae13d
> update: teach hg to override untracked dir with a tracked file on update

Queued this, thanks.

>    $ hg up
> -  abort: *: '$TESTTMP/t/b' (glob)
> +  abort: Directory not empty: '$TESTTMP/t/b'

I've resurrected the glob as the output would differ on Windows.

> -  $ rmdir b
> +  $ rm -r b/nonempty

Perhaps it should be "rm -r b" or "rm b/nonempty". I've dropped "-r" to
clarify it purposefully keeps an empty directory.


More information about the Mercurial-devel mailing list