equal
deleted
inserted
replaced
172 # Compare manifests |
172 # Compare manifests |
173 for f, n in m1.iteritems(): |
173 for f, n in m1.iteritems(): |
174 if partial and not partial(f): |
174 if partial and not partial(f): |
175 continue |
175 continue |
176 if f in m2: |
176 if f in m2: |
177 if overwrite or backwards: |
177 rflags = fmerge(f, f, f) |
178 rflags = m2.flags(f) |
|
179 else: |
|
180 rflags = fmerge(f, f, f) |
|
181 # are files different? |
178 # are files different? |
182 if n != m2[f]: |
179 if n != m2[f]: |
183 a = ma.get(f, nullid) |
180 a = ma.get(f, nullid) |
184 # are we clobbering? |
181 # are we clobbering? |
185 if overwrite: |
182 if overwrite: |