equal
deleted
inserted
replaced
172 for lfile in unsure: |
172 for lfile in unsure: |
173 standin = lfutil.standin(lfile) |
173 standin = lfutil.standin(lfile) |
174 if standin not in ctx1: |
174 if standin not in ctx1: |
175 # from second parent |
175 # from second parent |
176 modified.append(lfile) |
176 modified.append(lfile) |
177 elif lfutil.readasstandin(ctx1[standin]) \ |
177 elif (lfutil.readasstandin(ctx1[standin]) |
178 != lfutil.hashfile(self.wjoin(lfile)): |
178 != lfutil.hashfile(self.wjoin(lfile))): |
179 modified.append(lfile) |
179 modified.append(lfile) |
180 else: |
180 else: |
181 if listclean: |
181 if listclean: |
182 clean.append(lfile) |
182 clean.append(lfile) |
183 lfdirstate.normal(lfile) |
183 lfdirstate.normal(lfile) |