author | Martin von Zweigbergk <martinvonz@google.com> |
Fri, 19 Nov 2021 16:16:21 -0800 | |
changeset 48368 | 8c4881c07f57 |
parent 39405 | cb70501d8b71 |
child 49041 | 8309c83b6e2c |
permissions | -rw-r--r-- |
26420
2fc86d92c4a9
urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents:
19510
diff
changeset
|
1 |
https://bz.mercurial-scm.org/660 and: |
2fc86d92c4a9
urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents:
19510
diff
changeset
|
2 |
https://bz.mercurial-scm.org/322 |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
3 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
4 |
$ hg init |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
5 |
$ echo a > a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
6 |
$ mkdir b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
7 |
$ echo b > b/b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
8 |
$ hg commit -A -m "a is file, b is dir" |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
9 |
adding a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
10 |
adding b/b |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
11 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
12 |
File replaced with directory: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
13 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
14 |
$ rm a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
15 |
$ mkdir a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
16 |
$ echo a > a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
17 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
18 |
Should fail - would corrupt dirstate: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
19 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
20 |
$ hg add a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
21 |
abort: file 'a' in dirstate clashes with 'a/a' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
22 |
[255] |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
23 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
24 |
Removing shadow: |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
25 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
26 |
$ hg rm --after a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
27 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
28 |
Should succeed - shadow removed: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
29 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
30 |
$ hg add a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
31 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
32 |
Directory replaced with file: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
33 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
34 |
$ rm -r b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
35 |
$ echo b > b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
36 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
37 |
Should fail - would corrupt dirstate: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
38 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
39 |
$ hg add b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
40 |
abort: directory 'b' already in dirstate |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
41 |
[255] |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
42 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
43 |
Removing shadow: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
44 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
45 |
$ hg rm --after b/b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
46 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
47 |
Should succeed - shadow removed: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
48 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
49 |
$ hg add b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
50 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
51 |
Look what we got: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
52 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
53 |
$ hg st |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
54 |
A a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
55 |
A b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
56 |
R a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
57 |
R b/b |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
58 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
59 |
Revert reintroducing shadow - should fail: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
60 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
61 |
$ rm -r a b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
62 |
$ hg revert b/b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
63 |
abort: file 'b' in dirstate clashes with 'b/b' |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
64 |
[255] |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
65 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
66 |
Revert all - should succeed: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
67 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
68 |
$ hg revert --all |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
26420
diff
changeset
|
69 |
forgetting a/a |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
70 |
forgetting b |
39405
cb70501d8b71
revert: fix the inconsistency of status msgs in --interactive mode
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
35393
diff
changeset
|
71 |
undeleting a |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
26420
diff
changeset
|
72 |
undeleting b/b |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
73 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
74 |
$ hg st |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
75 |
|
19510
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
76 |
Issue3423: |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
77 |
|
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
78 |
$ hg forget a |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
79 |
$ echo zed > a |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
80 |
$ hg revert a |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
81 |
$ hg st |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
82 |
? a.orig |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
83 |
$ rm a.orig |
8b190adb7ee3
revert: make backup when unforgetting a file (issue3423)
Matt Mackall <mpm@selenic.com>
parents:
15447
diff
changeset
|
84 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
85 |
addremove: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
86 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
87 |
$ rm -r a b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
88 |
$ mkdir a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
89 |
$ echo a > a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
90 |
$ echo b > b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
91 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
92 |
$ hg addremove -s 0 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
93 |
removing a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
94 |
adding a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
95 |
adding b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
96 |
removing b/b |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
97 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
98 |
$ hg st |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
99 |
A a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
100 |
A b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
101 |
R a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
102 |
R b/b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
103 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
104 |
commit: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
105 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
106 |
$ hg ci -A -m "a is dir, b is file" |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
107 |
$ hg st --all |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
108 |
C a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
109 |
C b |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
110 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
111 |
Long directory replaced with file: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
112 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
113 |
$ mkdir d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
114 |
$ mkdir d/d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
115 |
$ echo d > d/d/d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
116 |
$ hg commit -A -m "d is long directory" |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
117 |
adding d/d/d |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
118 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
119 |
$ rm -r d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
120 |
$ echo d > d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
121 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
122 |
Should fail - would corrupt dirstate: |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
123 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
124 |
$ hg add d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
125 |
abort: directory 'd' already in dirstate |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
126 |
[255] |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
127 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
128 |
Removing shadow: |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
129 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
130 |
$ hg rm --after d/d/d |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
131 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
132 |
Should succeed - shadow removed: |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
133 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
134 |
$ hg add d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
135 |
$ hg ci -md |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
136 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
137 |
Update should work at least with clean working directory: |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
138 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
139 |
$ rm -r a b d |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
140 |
$ hg up -r 0 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
141 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5516
f252ba975925
Fix dir-changed-to-file updates on clean workdir.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5487
diff
changeset
|
142 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
143 |
$ hg st --all |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
144 |
C a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
145 |
C b/b |
5487
7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff
changeset
|
146 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
147 |
$ rm -r a b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
148 |
$ hg up -r 1 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
149 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
150 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
151 |
$ hg st --all |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
152 |
C a/a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
153 |
C b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11551
diff
changeset
|
154 |