--- a/tests/test-update-issue1456.t Wed Apr 10 12:31:07 2013 -0700
+++ b/tests/test-update-issue1456.t Wed Apr 10 12:34:42 2013 -0700
@@ -6,9 +6,16 @@
$ echo foo > foo
$ hg ci -qAm0
- $ chmod +x foo
- $ hg ci -m1
+ $ 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 local changes
@@ -18,11 +25,13 @@
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, 0 files removed, 0 files unresolved
+ 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ chmod -x foo
$ hg ci -m removeexec
nothing changed
@@ -30,7 +39,7 @@
$ 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
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
$ cd ..