Mercurial > hg > mercurial
changeset 154:987213efc76b
Test for collecting changes between 2 branches
| author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
|---|---|
| date | Tue, 11 Jan 2011 16:48:36 +0300 |
| parents | 2c97d352ad6e |
| children | b71e3e8fc990 |
| files | mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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<ModificationData> 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());