equal
deleted
inserted
replaced
2279 |
2279 |
2280 user = ctx.user() |
2280 user = ctx.user() |
2281 date = ctx.date() |
2281 date = ctx.date() |
2282 # Recompute copies (avoid recording a -> b -> a) |
2282 # Recompute copies (avoid recording a -> b -> a) |
2283 copied = copies.pathcopies(base, ctx) |
2283 copied = copies.pathcopies(base, ctx) |
|
2284 if old.p2: |
|
2285 copied.update(copies.pathcopies(old.p2(), ctx)) |
2284 |
2286 |
2285 # Prune files which were reverted by the updates: if old |
2287 # Prune files which were reverted by the updates: if old |
2286 # introduced file X and our intermediate commit, node, |
2288 # introduced file X and our intermediate commit, node, |
2287 # renamed that file, then those two files are the same and |
2289 # renamed that file, then those two files are the same and |
2288 # we can discard X from our list of files. Likewise if X |
2290 # we can discard X from our list of files. Likewise if X |