183 a = ma.get(f, nullid) |
183 a = ma.get(f, nullid) |
184 # are we clobbering? |
184 # are we clobbering? |
185 if overwrite: |
185 if overwrite: |
186 act("clobbering", "g", f, rflags) |
186 act("clobbering", "g", f, rflags) |
187 # or are we going back in time and clean? |
187 # or are we going back in time and clean? |
188 elif backwards and not n[20:]: |
188 elif backwards: |
189 act("reverting", "g", f, rflags) |
189 if not n[20:] or not p2[f].cmp(p1[f].data()): |
|
190 act("reverting", "g", f, rflags) |
190 # are both different from the ancestor? |
191 # are both different from the ancestor? |
191 elif n != a and m2[f] != a: |
192 elif n != a and m2[f] != a: |
192 act("versions differ", "m", f, f, f, rflags, False) |
193 act("versions differ", "m", f, f, f, rflags, False) |
193 # is remote's version newer? |
194 # is remote's version newer? |
194 elif m2[f] != a: |
195 elif m2[f] != a: |