Mercurial > hg > mercurial
changeset 91:99fc78c3e8db Darjeeling-5.0.x
one more test
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Wed Dec 09 01:28:10 2009 +0300 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Wed Dec 09 10:38:52 2009 +0300 @@ -364,7 +364,7 @@ return new File("mercurial-tests/testData/rep2").getAbsolutePath(); } - public void test_collect_changes_in_repo_with_merge_commits() throws Exception { + public void test_collect_changes_merge() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(mergeCommittsRepo()); List<ModificationData> changes = myVcs.collectBuildChanges(vcsRoot, "1:a3d15477d297", "4:6eeb8974fe67", new CheckoutRules("")); @@ -379,7 +379,7 @@ Assert.assertEquals(changes.get(2).getChanges().toString(), 0, changes.get(2).getChangeCount()); } - public void test_collect_changes_in_repo_with_merge_commits_conflict() throws Exception { + public void test_collect_changes_merge_conflict() throws Exception { VcsRootImpl vcsRoot = createVcsRoot(mergeCommittsRepo()); List<ModificationData> changes = myVcs.collectBuildChanges(vcsRoot, "6:6066b677d026", "8:b6e2d176fe8e", new CheckoutRules("")); @@ -389,6 +389,16 @@ assertFiles(Arrays.asList("M dir4/file41.txt", "A dir4/file42.txt", "A dir4/file43.txt", "R dir3/file3.txt"), changes.get(1)); } + public void test_collect_changes_merge_conflict_named_branch() throws Exception { + VcsRootImpl vcsRoot = createVcsRoot(mergeCommittsRepo()); + + List<ModificationData> changes = myVcs.collectBuildChanges(vcsRoot, "8:b6e2d176fe8e", "12:1e620196c4b6", new CheckoutRules("")); + assertEquals(changes.size(), 2); + + assertFiles(Arrays.asList("A dir6/file6.txt"), changes.get(0)); + assertFiles(Arrays.asList("M dir6/file6.txt", "A dir5/file5.txt"), changes.get(1)); + } + private void assertFiles(final List<String> expectedFiles, final ModificationData modificationData) { List<String> actualFiles = new ArrayList<String>(); for (VcsChange vc: modificationData.getChanges()) {
--- a/mercurial-tests/testData/rep2/hg/branchheads.cache Wed Dec 09 01:28:10 2009 +0300 +++ b/mercurial-tests/testData/rep2/hg/branchheads.cache Wed Dec 09 10:38:52 2009 +0300 @@ -1,2 +1,3 @@ -0f306546fb24b3e7332b8a5547af8d5006eb3105 8 -0f306546fb24b3e7332b8a5547af8d5006eb3105 default +48177654181c50307bfb333f824126f54858cf53 11 +48177654181c50307bfb333f824126f54858cf53 default +fc524efc2bc481e22365ab1452a41197060dbd9b test
--- a/mercurial-tests/testData/rep2/hg/store/fncache Wed Dec 09 01:28:10 2009 +0300 +++ b/mercurial-tests/testData/rep2/hg/store/fncache Wed Dec 09 10:38:52 2009 +0300 @@ -6,3 +6,5 @@ data/dir4/file41.txt.i data/dir4/file42.txt.i data/dir4/file43.txt.i +data/dir5/file5.txt.i +data/dir6/file6.txt.i