Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 24176:67952dc7a88f
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 02 Mar 2015 17:32:37 -0600 |
| parents | afed5d2e7985 ac41aa4a66ab |
| children | d8e0c591781c |
comparison
equal
deleted
inserted
replaced
| 24175:c4e3e7b031b7 | 24176:67952dc7a88f |
|---|---|
| 2264 | 2264 |
| 2265 user = ctx.user() | 2265 user = ctx.user() |
| 2266 date = ctx.date() | 2266 date = ctx.date() |
| 2267 # Recompute copies (avoid recording a -> b -> a) | 2267 # Recompute copies (avoid recording a -> b -> a) |
| 2268 copied = copies.pathcopies(base, ctx) | 2268 copied = copies.pathcopies(base, ctx) |
| 2269 if old.p2: | |
| 2270 copied.update(copies.pathcopies(old.p2(), ctx)) | |
| 2269 | 2271 |
| 2270 # Prune files which were reverted by the updates: if old | 2272 # Prune files which were reverted by the updates: if old |
| 2271 # introduced file X and our intermediate commit, node, | 2273 # introduced file X and our intermediate commit, node, |
| 2272 # renamed that file, then those two files are the same and | 2274 # renamed that file, then those two files are the same and |
| 2273 # we can discard X from our list of files. Likewise if X | 2275 # we can discard X from our list of files. Likewise if X |