Mercurial > hg
view tests/test-update-issue1456.t @ 18729:4e53ac3f466a stable
largefiles: updatelfiles should use working dir standins, not standins from p1
This makes a difference when working directory is dirty, especially when
merging with a revision for which we don't have largefiles.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 28 Feb 2013 13:45:18 +0100 |
parents | 44bda93df90e |
children | ed676ed67a5c |
line wrap: on
line source
$ "$TESTDIR/hghave" execbit || exit 80 $ rm -rf a $ hg init a $ cd a $ echo foo > foo $ hg ci -qAm0 $ chmod +x foo $ hg ci -m1 $ hg co -q 0 $ echo dirty > foo $ hg up -c abort: uncommitted local changes [255] $ hg up -q $ cat foo dirty $ hg st -A M foo Validate update of standalone execute bit change: $ hg up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ chmod -x foo $ hg ci -m removeexec nothing changed [1] $ hg up -C 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg st $ cd ..