Mercurial > hg > mercurial-source
diff tests/test-update-issue1456.t @ 12279:28e2e3804f2e
combine tests
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Tue, 14 Sep 2010 12:20:51 +0200 |
parents | tests/test-up-issue1456@f331de880cbb |
children | 4134686b83e1 |
line wrap: on
line diff
copy from tests/test-up-issue1456 copy to tests/test-update-issue1456.t --- a/tests/test-up-issue1456 +++ b/tests/test-update-issue1456.t @@ -1,24 +1,31 @@ -#!/bin/sh - -rm -rf a -hg init a -cd a + $ 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 -hg up -q -cat foo -hg st -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 + $ hg up -q + $ cat foo + dirty + $ hg st -A + M foo -echo '% validate update of standalone execute bit change' -hg up -C 0 -chmod -x foo -hg ci -m removeexec -hg up -C 0 -hg up -hg st +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 + $ hg up -C 0 + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg up + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg st +