equal
deleted
inserted
replaced
1033 |
1033 |
1034 for f, n in mw.iteritems(): |
1034 for f, n in mw.iteritems(): |
1035 if f in m2: |
1035 if f in m2: |
1036 s = 0 |
1036 s = 0 |
1037 |
1037 |
|
1038 # is the wfile new since m1, and match m2? |
|
1039 if n not in m1: |
|
1040 t1 = self.wfile(f).read() |
|
1041 t2 = self.file(f).revision(m2[f]) |
|
1042 if cmp(t1, t2) == 0: |
|
1043 mark[f] = 1 |
|
1044 n = m2[f] |
|
1045 del t1, t2 |
|
1046 |
1038 # are files different? |
1047 # are files different? |
1039 if n != m2[f]: |
1048 if n != m2[f]: |
1040 a = ma.get(f, nullid) |
1049 a = ma.get(f, nullid) |
1041 # are both different from the ancestor? |
1050 # are both different from the ancestor? |
1042 if n != a and m2[f] != a: |
1051 if n != a and m2[f] != a: |