equal
deleted
inserted
replaced
164 lfiles = set(lfdirstate._map) |
164 lfiles = set(lfdirstate._map) |
165 ignored = set(result[5]).difference(lfiles) |
165 ignored = set(result[5]).difference(lfiles) |
166 unknown = set(result[4]).difference(lfiles) |
166 unknown = set(result[4]).difference(lfiles) |
167 if parentworking: |
167 if parentworking: |
168 for lfile in unsure: |
168 for lfile in unsure: |
169 if ctx1[lfutil.standin(lfile)].data().strip() \ |
169 standin = lfutil.standin(lfile) |
|
170 if standin not in ctx1: |
|
171 # from second parent |
|
172 modified.append(lfile) |
|
173 elif ctx1[standin].data().strip() \ |
170 != lfutil.hashfile(self.wjoin(lfile)): |
174 != lfutil.hashfile(self.wjoin(lfile)): |
171 modified.append(lfile) |
175 modified.append(lfile) |
172 else: |
176 else: |
173 clean.append(lfile) |
177 clean.append(lfile) |
174 lfdirstate.normal(lfile) |
178 lfdirstate.normal(lfile) |