# HG changeset patch # User Dmitry Neverov # Date 1294753716 -10800 # Node ID 987213efc76bba24dd14cf45e8adef41e24fc5c3 # Parent 2c97d352ad6eac842cff366bedb51914c80a054f Test for collecting changes between 2 branches diff -r 2c97d352ad6e -r 987213efc76b mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java --- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Tue Jan 11 16:13:31 2011 +0300 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Tue Jan 11 16:48:36 2011 +0300 @@ -343,6 +343,16 @@ return new File("mercurial-tests/testData/rep2").getAbsolutePath(); } + public void test_collect_changes_between_two_different_roots() throws Exception { + VcsRootImpl defaultRoot = createVcsRoot(mergeCommittsRepo()); + VcsRootImpl branchRoot = createVcsRoot(mergeCommittsRepo(), "test"); + List changes = myVcs.collectChanges(defaultRoot, "11:48177654181c", branchRoot, "10:fc524efc2bc4", CheckoutRules.DEFAULT); + assertEquals(changes.size(), 2); + + assertEquals("9:8c44244d6645", changes.get(0).getVersion()); + assertEquals("10:fc524efc2bc4", changes.get(1).getVersion()); + } + public void test_collect_changes_merge() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(mergeCommittsRepo());