##// END OF EJS Templates
only files in normal state should be marked as deleted...
Benoit Boissinot -
r1488:08c78519 default
parent child Browse files
Show More
@@ -390,7 +390,7 b' class dirstate:'
390 nonexistent = False
390 nonexistent = False
391 # XXX: what to do with file no longer present in the fs
391 # XXX: what to do with file no longer present in the fs
392 # who are not removed in the dirstate ?
392 # who are not removed in the dirstate ?
393 if nonexistent:
393 if nonexistent and type in "nm":
394 deleted.append(fn)
394 deleted.append(fn)
395 continue
395 continue
396 # check the common case first
396 # check the common case first
@@ -11,4 +11,9 b" hg commit -d '1\t15.1' -m commit-4"
11 hg commit -d 'foo bar' -m commit-5
11 hg commit -d 'foo bar' -m commit-5
12 hg commit -d ' 1 4444' -m commit-6
12 hg commit -d ' 1 4444' -m commit-6
13 hg commit -d '111111111111 0' -m commit-7
13 hg commit -d '111111111111 0' -m commit-7
14
15 echo bar > bar
16 hg add bar
17 rm bar
18 hg commit -d "0 0" -m commit-8 2>&1 | sed -e "s:/.*\(/test/.*\):...\1:"
14 exit 0
19 exit 0
@@ -13,3 +13,4 b" abort: invalid date: ' 1 4444'"
13 transaction abort!
13 transaction abort!
14 rollback completed
14 rollback completed
15 abort: date exceeds 32 bits: 111111111111
15 abort: date exceeds 32 bits: 111111111111
16 abort: No such file or directory: .../test/bar
General Comments 0
You need to be logged in to leave comments. Login now