# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1420198670 -3600
# Node ID 40124b50393300ae47feeb6a6a3813fee2d4ee86
# Parent  66cc56a53d8a8bcac3d648e8a175a566d81851a0# Parent  6b5e83970a26e69ce731771f448588759d410650
Merge branch Hajipur-9.0.x

diff -r 66cc56a53d8a -r 40124b503933 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSharedMirrorsTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSharedMirrorsTest.java	Fri Jan 02 12:26:32 2015 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSharedMirrorsTest.java	Fri Jan 02 12:37:50 2015 +0100
@@ -134,7 +134,9 @@
 
 
   @TestFor(issues = "TW-39482")
-  public void should_recover_from_abandoned_transaction() throws Exception {
+  @RequiredHgVersion(min = "2.4")
+  @Test(dataProviderClass = HgVersionConstraint.class, dataProvider = "installedHgVersion")
+  public void should_recover_from_abandoned_transaction(@NotNull HgVersion _) throws Exception {
     File remoteRepo = myTempFiles.createTempDir();
     Util.copyRepository(new File("mercurial-tests/testData/bookmarks/1"), remoteRepo);
     VcsRootImpl root = vcsRoot().withUrl(remoteRepo).build();