[PATCH 2 of 2] transplant: check that changeset was not applied more carefully
dirkjan at ochtman.nl
Tue Nov 24 12:59:02 CST 2009
On Tue, Nov 24, 2009 at 14:43, Alexander Solovyov
<piranha at piranha.org.ua> 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.
Can we get tests for this, or would that be Hard?
More information about the Mercurial-devel