equal
deleted
inserted
replaced
1050 for f, n in mw.iteritems(): |
1050 for f, n in mw.iteritems(): |
1051 if f in m2: |
1051 if f in m2: |
1052 s = 0 |
1052 s = 0 |
1053 |
1053 |
1054 # is the wfile new since m1, and match m2? |
1054 # is the wfile new since m1, and match m2? |
1055 if n not in m1: |
1055 if f not in m1: |
1056 t1 = self.wfile(f).read() |
1056 t1 = self.wfile(f).read() |
1057 t2 = self.file(f).revision(m2[f]) |
1057 t2 = self.file(f).revision(m2[f]) |
1058 if cmp(t1, t2) == 0: |
1058 if cmp(t1, t2) == 0: |
1059 mark[f] = 1 |
1059 mark[f] = 1 |
1060 n = m2[f] |
1060 n = m2[f] |