Show More
@@ -568,7 +568,7 b' class dirstate(object):' | |||||
568 | nonexistent = False |
|
568 | nonexistent = False | |
569 | # XXX: what to do with file no longer present in the fs |
|
569 | # XXX: what to do with file no longer present in the fs | |
570 | # who are not removed in the dirstate ? |
|
570 | # who are not removed in the dirstate ? | |
571 | if nonexistent and type_ in "nm": |
|
571 | if nonexistent and type_ in "nma": | |
572 | dadd(fn) |
|
572 | dadd(fn) | |
573 | continue |
|
573 | continue | |
574 | # check the common case first |
|
574 | # check the common case first |
@@ -19,11 +19,12 b" hg commit -d 'foo bar' -m commit-5" | |||||
19 | hg commit -d ' 1 4444' -m commit-6 |
|
19 | hg commit -d ' 1 4444' -m commit-6 | |
20 | hg commit -d '111111111111 0' -m commit-7 |
|
20 | hg commit -d '111111111111 0' -m commit-7 | |
21 |
|
21 | |||
22 | echo % partial commit test |
|
22 | echo % commit added file that has been deleted | |
23 | echo bar > bar |
|
23 | echo bar > bar | |
24 | hg add bar |
|
24 | hg add bar | |
25 | rm bar |
|
25 | rm bar | |
26 | hg commit -d "1000000 0" -m commit-8 2>&1 | cleanpath |
|
26 | hg commit -d "1000000 0" -m commit-8 2>&1 | cleanpath | |
|
27 | hg commit -d "1000000 0" -m commit-8 bar 2>&1 | cleanpath | |||
27 |
|
28 | |||
28 | hg -q revert -a --no-backup |
|
29 | hg -q revert -a --no-backup | |
29 |
|
30 |
@@ -12,9 +12,9 b' transaction abort!' | |||||
12 | rollback completed |
|
12 | rollback completed | |
13 | abort: invalid date: 'foo bar' |
|
13 | abort: invalid date: 'foo bar' | |
14 | nothing changed |
|
14 | nothing changed | |
15 | % partial commit test |
|
15 | % commit added file that has been deleted | |
16 | trouble committing bar! |
|
16 | nothing changed | |
17 | abort: No such file or directory: .../test/bar |
|
17 | abort: file .../test/bar not found! | |
18 | adding dir/file |
|
18 | adding dir/file | |
19 | dir/file |
|
19 | dir/file | |
20 | adding dir.file |
|
20 | adding dir.file |
@@ -32,7 +32,7 b' hg add b' | |||||
32 | echo %% should show b added |
|
32 | echo %% should show b added | |
33 | hg status b |
|
33 | hg status b | |
34 | rm b |
|
34 | rm b | |
35 |
echo %% should show b |
|
35 | echo %% should show b deleted | |
36 | hg status b |
|
36 | hg status b | |
37 | hg revert -v b |
|
37 | hg revert -v b | |
38 | echo %% should not find b |
|
38 | echo %% should not find b |
@@ -20,8 +20,8 b' M c' | |||||
20 | ? b |
|
20 | ? b | |
21 | %% should show b added |
|
21 | %% should show b added | |
22 | A b |
|
22 | A b | |
23 |
%% should show b |
|
23 | %% should show b deleted | |
24 |
|
|
24 | ! b | |
25 | forgetting b |
|
25 | forgetting b | |
26 | %% should not find b |
|
26 | %% should not find b | |
27 | b: No such file or directory |
|
27 | b: No such file or directory |
General Comments 0
You need to be logged in to leave comments.
Login now