equal
deleted
inserted
replaced
217 % (rp[0], short(rp[1])), f) |
217 % (rp[0], short(rp[1])), f) |
218 elif rp[1] == nullid: |
218 elif rp[1] == nullid: |
219 warn(_("warning: %s@%s: copy source revision is nullid %s:%s") |
219 warn(_("warning: %s@%s: copy source revision is nullid %s:%s") |
220 % (f, lr, rp[0], short(rp[1]))) |
220 % (f, lr, rp[0], short(rp[1]))) |
221 else: |
221 else: |
222 rev = fl2.rev(rp[1]) |
222 fl2.rev(rp[1]) |
223 except Exception, inst: |
223 except Exception, inst: |
224 exc(lr, _("checking rename of %s") % short(n), inst, f) |
224 exc(lr, _("checking rename of %s") % short(n), inst, f) |
225 |
225 |
226 # cross-check |
226 # cross-check |
227 if f in filenodes: |
227 if f in filenodes: |