equal
deleted
inserted
replaced
1582 elif p2 == nullid: |
1582 elif p2 == nullid: |
1583 # update dirstate from parent1's manifest |
1583 # update dirstate from parent1's manifest |
1584 m1n = self.changelog.read(p1)[0] |
1584 m1n = self.changelog.read(p1)[0] |
1585 m1 = self.manifest.read(m1n) |
1585 m1 = self.manifest.read(m1n) |
1586 file_ = self.file(f) |
1586 file_ = self.file(f) |
1587 f_len = file_.length(file_.rev(m1[f])) |
1587 f_len = len(file_.read(m1[f])) |
1588 self.dirstate.update([f], mode, st_size=f_len, st_mtime=0) |
1588 self.dirstate.update([f], mode, st_size=f_len, st_mtime=0) |
1589 else: |
1589 else: |
1590 self.ui.warn("Second parent without branch merge!?\n" |
1590 self.ui.warn("Second parent without branch merge!?\n" |
1591 "Dirstate for file %s may be wrong.\n" % f) |
1591 "Dirstate for file %s may be wrong.\n" % f) |
1592 |
1592 |