[PATCH] update: fix bug when update tries to modify folder symlink

Yuya Nishihara yuya at tcha.org
Tue Jul 26 08:19:45 EDT 2016


On Thu, 21 Jul 2016 15:56:37 -0700, Kostia Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia at fb.com>
> # Date 1469141747 25200
> #      Thu Jul 21 15:55:47 2016 -0700
> # Branch stable
> # Node ID 3d5d3b8471ebed15fc8c1fd8243afe64a3908591
> # Parent  53e80179bd6ad4e03a0d1cc19dcb2deed8d2fbf5
> update: fix bug when update tries to modify folder symlink

> --- a/tests/test-update-names.t
> +++ b/tests/test-update-names.t
> @@ -53,3 +53,19 @@ make sure that this does not erase untra
>    abort: *: '$TESTTMP/r1/r2/name' (glob)
>    [255]
>    $ cd ..

I've added "#if symlink" in flight.

> +Test update when two commits have symlinks that point to different folders
> +  $ hg init r3 && cd r3
> +  $ echo root > root && hg ci -Am root
> +  adding root
> +  $ mkdir folder1 && mkdir folder2
> +  $ ln -s folder1 folder
> +  $ hg ci -Am "symlink to folder1"
> +  adding folder
> +  $ rm folder
> +  $ ln -s folder2 folder
> +  $ hg ci -Am "symlink to folder2"
> +  $ hg up 1
> +  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  $ cd ..


More information about the Mercurial-devel mailing list