diff --git a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java index 09363b58bbfc..b397b18a7fde 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java @@ -115,4 +115,15 @@ public abstract class HgPlatformTest extends UsefulTestCase { hg("add file.txt"); hg("commit -m initial"); } + + public void prepareSecondRepository() throws IOException { + cd(myRepository); + hg("clone " + myRepository.getCanonicalPath() + " childRepo"); + myChildRepo = myRepository.findChild("childRepo"); + cd(myChildRepo); + hg("pull"); + hg("update"); + HgTestUtil.updateDirectoryMappings(myProject, myRepository); + HgTestUtil.updateDirectoryMappings(myProject, myChildRepo); + } } diff --git a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java index 66cd001c0437..e49feb43f4b0 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/merge/HgMergeProviderTest.java @@ -191,14 +191,4 @@ public class HgMergeProviderTest extends HgPlatformTest { Assert.assertEquals(s, new String(bytes)); } - private void prepareSecondRepository() throws IOException { - cd(myRepository); - hg("clone " + myRepository.getCanonicalPath() + " childRepo"); - myChildRepo = myRepository.findChild("childRepo"); - cd(myChildRepo); - hg("pull"); - hg("update"); - HgTestUtil.updateDirectoryMappings(myProject, myRepository); - HgTestUtil.updateDirectoryMappings(myProject, myChildRepo); - } }