Show More
@@ -90,15 +90,6 b' def reposetup(ui, repo):' | |||
|
90 | 90 | working = ctx2.rev() is None |
|
91 | 91 | parentworking = working and ctx1 == self['.'] |
|
92 | 92 | |
|
93 | def inctx(file, ctx): | |
|
94 | try: | |
|
95 | if ctx.rev() is None: | |
|
96 | return file in ctx.manifest() | |
|
97 | ctx[file] | |
|
98 | return True | |
|
99 | except KeyError: | |
|
100 | return False | |
|
101 | ||
|
102 | 93 | if match is None: |
|
103 | 94 | match = match_.always(self.root, self.getcwd()) |
|
104 | 95 | |
@@ -182,7 +173,7 b' def reposetup(ui, repo):' | |||
|
182 | 173 | |
|
183 | 174 | for lfile in tocheck: |
|
184 | 175 | standin = lfutil.standin(lfile) |
|
185 |
if |
|
|
176 | if standin in ctx1: | |
|
186 | 177 | if ctx1[standin].data().strip() != \ |
|
187 | 178 | lfutil.hashfile(self.wjoin(lfile)): |
|
188 | 179 | modified.append(lfile) |
General Comments 0
You need to be logged in to leave comments.
Login now