equal
deleted
inserted
replaced
65 return None |
65 return None |
66 |
66 |
67 files = (initialfiles - exclude) |
67 files = (initialfiles - exclude) |
68 # return the p1 so that we don't create an obsmarker later |
68 # return the p1 so that we don't create an obsmarker later |
69 if not keepcommit: |
69 if not keepcommit: |
70 return ctx.parents()[0].node() |
70 return ctx.p1().node() |
71 |
71 |
72 # Filter copies |
72 # Filter copies |
73 copied = copiesmod.pathcopies(base, ctx) |
73 copied = copiesmod.pathcopies(base, ctx) |
74 copied = dict((dst, src) for dst, src in copied.iteritems() |
74 copied = dict((dst, src) for dst, src in copied.iteritems() |
75 if dst in files) |
75 if dst in files) |