[PATCH 2 of 2 evolve-ext] test-evolve-bumped: add new test case for merge

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Jun 22 17:14:53 CDT 2015



On 06/19/2015 06:38 PM, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon at fb.com>
> # Date 1434763077 25200
> #      Fri Jun 19 18:17:57 2015 -0700
> # Node ID 459da3718f91405cf5a72b03ab58623a50b11d2b
> # Parent  bd83396dd93f1c13efdba3140c2a92c6aed2be9f
> test-evolve-bumped: add new test case for merge
>
> Before this patch we were not testing our warning message for bumped changesets
> that are the product of a merge. This patch adds a test case for that.

I've pushed these ones with an update to the test comment and moving the 
rogue hunk from patch 1 to patch 2.


-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list