Mercurial > hg > mercurial-source
view tests/test-casecollision.t @ 16255:ca5cc2976574 stable
merge: handle linear update to symlink correctly (issue3316)
This fixes a regression introduced by fcf66193b186. If no file-level
merge is needed, we can update flags directly, otherwise we have a
conflict to resolve in filemerge.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 13 Mar 2012 16:28:08 -0500 |
parents | 524c560e2d32 |
children | 14e44933d175 |
line wrap: on
line source
run only on case-sensitive filesystems $ "$TESTDIR/hghave" no-icasefs || exit 80 test file addition with colliding case $ hg init repo1 $ cd repo1 $ echo a > a $ echo A > A $ hg add a $ hg st A a ? A $ hg add --config ui.portablefilenames=abort A abort: possible case-folding collision for A [255] $ hg st A a ? A $ hg add A warning: possible case-folding collision for A $ hg st A A A a $ hg forget A $ hg st A a ? A $ hg add --config ui.portablefilenames=no A $ hg st A A A a case changing rename must not warn or abort $ echo c > c $ hg ci -qAmx $ hg mv c C $ cd ..