Show More
@@ -213,7 +213,9 b' class repowatcher(object):' | |||||
213 | if time != int(st_mtime): |
|
213 | if time != int(st_mtime): | |
214 | return 'l' |
|
214 | return 'l' | |
215 | return 'n' |
|
215 | return 'n' | |
216 | if type_ == '?' and self.dirstate._ignore(fn): |
|
216 | if type_ == '?' and self.dirstate._dirignore(fn): | |
|
217 | # we must check not only if the file is ignored, but if any part | |||
|
218 | # of its path match an ignore pattern | |||
217 | return 'i' |
|
219 | return 'i' | |
218 | return type_ |
|
220 | return type_ | |
219 |
|
221 |
@@ -97,4 +97,17 b" hg ci -m 'working'" | |||||
97 | echo b >> 1844/foo |
|
97 | echo b >> 1844/foo | |
98 | hg ci 1844 -m 'broken' |
|
98 | hg ci 1844 -m 'broken' | |
99 |
|
99 | |||
|
100 | # Test for issue884: "Build products not ignored until .hgignore is touched" | |||
|
101 | echo '^build$' > .hgignore | |||
|
102 | hg add .hgignore | |||
|
103 | hg ci .hgignore -m 'ignorelist' | |||
|
104 | ||||
|
105 | # Now, lets add some build products... | |||
|
106 | mkdir build | |||
|
107 | touch build/x | |||
|
108 | touch build/y | |||
|
109 | ||||
|
110 | # build/x & build/y shouldn't appear in "hg st" | |||
|
111 | hg st | |||
|
112 | ||||
100 | kill `cat hg.pid` |
|
113 | kill `cat hg.pid` |
General Comments 0
You need to be logged in to leave comments.
Login now