equal
deleted
inserted
replaced
1275 mergeancestor=mergeancestor, labels=labels) |
1275 mergeancestor=mergeancestor, labels=labels) |
1276 |
1276 |
1277 # drop the second merge parent |
1277 # drop the second merge parent |
1278 repo.dirstate.beginparentchange() |
1278 repo.dirstate.beginparentchange() |
1279 repo.setparents(repo['.'].node(), nullid) |
1279 repo.setparents(repo['.'].node(), nullid) |
1280 repo.dirstate.write() |
1280 repo.dirstate.write(repo.currenttransaction()) |
1281 # fix up dirstate for copies and renames |
1281 # fix up dirstate for copies and renames |
1282 copies.duplicatecopies(repo, ctx.rev(), pctx.rev()) |
1282 copies.duplicatecopies(repo, ctx.rev(), pctx.rev()) |
1283 repo.dirstate.endparentchange() |
1283 repo.dirstate.endparentchange() |
1284 return stats |
1284 return stats |