sapling/tests/test-update-issue1456.t

  $ "$TESTDIR/hghave" execbit || exit 80

  $ rm -rf a
  $ hg init a
  $ cd a

  $ echo foo > foo
  $ hg ci -qAm0
  $ echo toremove > toremove
  $ echo todelete > todelete
  $ chmod +x foo toremove todelete
  $ hg ci -qAm1

Test that local removed/deleted, remote removed works with flags
  $ hg rm toremove
  $ rm todelete
  $ hg co -q 0

  $ echo dirty > foo
  $ hg up -c
  abort: uncommitted changes
  [255]
  $ hg up -q
  $ cat foo
  dirty
  $ hg st -A
  M foo
  C todelete
  C toremove

Validate update of standalone execute bit change:

  $ hg up -C 0
  1 files updated, 0 files merged, 2 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
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg st

  $ cd ..
tests: use 'hghave execbit' for tests that manipulate x bit in file system 2011-11-07 06:14:54 +04:00			`$ "$TESTDIR/hghave" execbit \|\| exit 80`

combine tests 2010-09-14 14:20:51 +04:00			`$ rm -rf a`
			`$ hg init a`
			`$ cd a`

			`$ echo foo > foo`
			`$ hg ci -qAm0`
manifestmerge: handle workdir removed, remote removed with flags This can happen when a file with flags is removed or deleted in the working directory and also not present in m2. The obvious solution is to add a __delitem__ override to manifestdict that removes the file from flags if necessary, but that has a significant performance cost in some cases, e.g. hg status --rev rev1 --rev rev2 <file>. 2013-04-10 23:34:42 +04:00			`$ echo toremove > toremove`
			`$ echo todelete > todelete`
			`$ chmod +x foo toremove todelete`
			`$ hg ci -qAm1`

			`Test that local removed/deleted, remote removed works with flags`
			`$ hg rm toremove`
			`$ rm todelete`
combine tests 2010-09-14 14:20:51 +04:00			`$ hg co -q 0`
manifestmerge: handle workdir removed, remote removed with flags This can happen when a file with flags is removed or deleted in the working directory and also not present in m2. The obvious solution is to add a __delitem__ override to manifestdict that removes the file from flags if necessary, but that has a significant performance cost in some cases, e.g. hg status --rev rev1 --rev rev2 <file>. 2013-04-10 23:34:42 +04:00
combine tests 2010-09-14 14:20:51 +04:00			`$ echo dirty > foo`
			`$ hg up -c`
update: standardize error message for dirty update --check This and following patches will standardize the error message for dirty working directories to "uncommitted changes". 2013-09-24 07:33:02 +04:00			`abort: uncommitted changes`
tests: add exit codes to unified tests 2010-09-17 02:51:32 +04:00			`[255]`
combine tests 2010-09-14 14:20:51 +04:00			`$ hg up -q`
			`$ cat foo`
			`dirty`
			`$ hg st -A`
			`M foo`
manifestmerge: handle workdir removed, remote removed with flags This can happen when a file with flags is removed or deleted in the working directory and also not present in m2. The obvious solution is to add a __delitem__ override to manifestdict that removes the file from flags if necessary, but that has a significant performance cost in some cases, e.g. hg status --rev rev1 --rev rev2 <file>. 2013-04-10 23:34:42 +04:00			`C todelete`
			`C toremove`
combine tests 2010-09-14 14:20:51 +04:00
			`Validate update of standalone execute bit change:`

			`$ hg up -C 0`
manifestmerge: handle workdir removed, remote removed with flags This can happen when a file with flags is removed or deleted in the working directory and also not present in m2. The obvious solution is to add a __delitem__ override to manifestdict that removes the file from flags if necessary, but that has a significant performance cost in some cases, e.g. hg status --rev rev1 --rev rev2 <file>. 2013-04-10 23:34:42 +04:00			`1 files updated, 0 files merged, 2 files removed, 0 files unresolved`
combine tests 2010-09-14 14:20:51 +04:00			`$ chmod -x foo`
			`$ hg ci -m removeexec`
			`nothing changed`
tests: add exit codes to unified tests 2010-09-17 02:51:32 +04:00			`[1]`
combine tests 2010-09-14 14:20:51 +04:00			`$ hg up -C 0`
			`0 files updated, 0 files merged, 0 files removed, 0 files unresolved`
			`$ hg up`
manifestmerge: handle workdir removed, remote removed with flags This can happen when a file with flags is removed or deleted in the working directory and also not present in m2. The obvious solution is to add a __delitem__ override to manifestdict that removes the file from flags if necessary, but that has a significant performance cost in some cases, e.g. hg status --rev rev1 --rev rev2 <file>. 2013-04-10 23:34:42 +04:00			`3 files updated, 0 files merged, 0 files removed, 0 files unresolved`
combine tests 2010-09-14 14:20:51 +04:00			`$ hg st`

tests: add missing trailing 'cd ..' Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around. 2012-06-11 03:40:51 +04:00			`$ cd ..`