[PATCH] tests: add test for symlink regression fixed by ca5cc2976574

[Markus Zapke-Gründemann]

Markus Zapke-Gründemann schrieb:
> # HG changeset patch
> # User Markus Zapke-Gründemann <markus at keimlink.de>
> # Date 1341189237 -7200
> # Branch stable
> # Node ID d5c33f148540cf8e06211ce22fe2ceb78e507548
> # Parent  2440822446ce248175dd597f0ec8df24d8d10217
> tests: add test for symlink regression fixed by ca5cc2976574
> 
> This is a test for a regression introduced by fcf66193b186 and fixed by
> ca5cc2976574 for 2.1.2. The fix had a regression test only for merging.
> 
> diff --git a/tests/test-symlinks.t b/tests/test-symlinks.t
> --- a/tests/test-symlinks.t
> +++ b/tests/test-symlinks.t
> @@ -253,3 +253,25 @@ Issue995: hg copy -A incorrectly handles
>    $ mv dirlink newdir/dirlink
>    $ hg mv -A dirlink newdir/dirlink
>  
> +
> +move file and create symlink to it at the original location, then update
> +regression was introduced by fcf66193b186 and fixed by ca5cc2976574 for 2.1.2
> +
> +  $ mkdir d1 d2
> +  $ echo c1 > d1/f1
> +  $ hg commit -Am "add real file f1"
> +  adding d1/f1
> +  $ mv d1/f1 d2
> +  $ cd d1
> +  $ ln -s ../d2/f1
> +  $ cd ..
> +  $ hg commit -Am "move f1 and create symlink to original"
> +  adding d2/f1
> +  $ "$TESTDIR/readlink.py" d1/f1
> +  d1/f1 -> ../d2/f1
> +  $ hg up 3
> +  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
> +  $ hg up
> +  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> +  $ "$TESTDIR/readlink.py" d1/f1
> +  d1/f1 -> ../d2/f1
Any thoughts on the patch? ca5cc2976574 added also a test but I think it's
testing merging. Therefore I submitted this patch to test the scenario
explicitly where a user encountered the error after upgrading from 1.8.1 to 2.1.


Regards

Markus