[PATCH 2 of 2] transplant: check that changeset was not applied more carefully

Matt Mackall mpm at selenic.com
Tue Nov 24 11:25:27 CST 2009


On Tue, 2009-11-24 at 15:43 +0200, Alexander Solovyov wrote:
> # HG changeset patch
> # User Alexander Solovyov <piranha at piranha.org.ua>
> # Date 1259065963 -7200
> # Node ID 542903faf1be4c054b196b49c1378eb2f852fb3c
> # Parent  58f9a9b56889ade2eff4a570851d19824e3766fc
> transplant: check that changeset was not applied more carefully
> 
> Previously, if you have deleted .hg/transplant/transplants file, attempt to
> transplanting already applied patch will result in merge errors. Patch fixes
> this problem by regenerating this file is it does not exist.
> 
> On almost 10k revisions of Mercurial repository itself this takes around of 1.5
> seconds, which seems acceptable for a one-time operation.

Seems reasonable. Brendan?

-- 
http://selenic.com : development and support for Mercurial and Linux




More information about the Mercurial-devel mailing list