Show More
@@ -0,0 +1,19 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | hg init a | |||
|
4 | cd a | |||
|
5 | hg init b | |||
|
6 | echo x > b/x | |||
|
7 | echo '# should print nothing' | |||
|
8 | hg st | |||
|
9 | echo '# should print ? b/x' | |||
|
10 | hg st b/x | |||
|
11 | ||||
|
12 | hg add b/x | |||
|
13 | ||||
|
14 | echo '# should print A b/x' | |||
|
15 | hg st | |||
|
16 | echo '# should forget b/x' | |||
|
17 | hg forget | |||
|
18 | echo '# should print nothing' | |||
|
19 | hg st b |
@@ -0,0 +1,8 b'' | |||||
|
1 | # should print nothing | |||
|
2 | # should print ? b/x | |||
|
3 | ? b/x | |||
|
4 | # should print A b/x | |||
|
5 | A b/x | |||
|
6 | # should forget b/x | |||
|
7 | forgetting b/x | |||
|
8 | # should print nothing |
@@ -340,7 +340,13 b' class dirstate(object):' | |||||
340 | names.sort() |
|
340 | names.sort() | |
341 | # nd is the top of the repository dir tree |
|
341 | # nd is the top of the repository dir tree | |
342 | nd = util.normpath(top[len(self.root) + 1:]) |
|
342 | nd = util.normpath(top[len(self.root) + 1:]) | |
343 |
if nd == '.': |
|
343 | if nd == '.': | |
|
344 | nd = '' | |||
|
345 | else: | |||
|
346 | hg = bisect.bisect_left(names, '.hg') | |||
|
347 | if hg < len(names) and names[hg] == '.hg': | |||
|
348 | if os.path.isdir(os.path.join(top, '.hg')): | |||
|
349 | continue | |||
344 | for f in names: |
|
350 | for f in names: | |
345 | np = util.pconvert(os.path.join(nd, f)) |
|
351 | np = util.pconvert(os.path.join(nd, f)) | |
346 | if seen(np): |
|
352 | if seen(np): |
General Comments 0
You need to be logged in to leave comments.
Login now