changeset 91:99fc78c3e8db Darjeeling-5.0.x

one more test
author Pavel.Sher
date Wed, 09 Dec 2009 10:38:52 +0300
parents 5d9c34cb543a
children dc26ddd9ffd4 889f1bd868f8
files mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/testData/rep2/hg/branchheads.cache mercurial-tests/testData/rep2/hg/dirstate mercurial-tests/testData/rep2/hg/store/00changelog.i mercurial-tests/testData/rep2/hg/store/00manifest.i mercurial-tests/testData/rep2/hg/store/data/dir5/file5.txt.i mercurial-tests/testData/rep2/hg/store/data/dir6/file6.txt.i mercurial-tests/testData/rep2/hg/store/fncache mercurial-tests/testData/rep2/hg/store/undo mercurial-tests/testData/rep2/hg/tags.cache mercurial-tests/testData/rep2/hg/undo.dirstate
diffstat 11 files changed, 18 insertions(+), 5 deletions(-) [+]
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
Binary file mercurial-tests/testData/rep2/hg/dirstate has changed
Binary file mercurial-tests/testData/rep2/hg/store/00changelog.i has changed
Binary file mercurial-tests/testData/rep2/hg/store/00manifest.i has changed
Binary file mercurial-tests/testData/rep2/hg/store/data/dir5/file5.txt.i has changed
Binary file mercurial-tests/testData/rep2/hg/store/data/dir6/file6.txt.i has changed
--- 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
Binary file mercurial-tests/testData/rep2/hg/store/undo has changed
--- a/mercurial-tests/testData/rep2/hg/tags.cache	Wed Dec 09 01:28:10 2009 +0300
+++ b/mercurial-tests/testData/rep2/hg/tags.cache	Wed Dec 09 10:38:52 2009 +0300
@@ -1,2 +1,2 @@
-8 b6e2d176fe8e13ce07bc915041453104f1559b7a
+12 1e620196c4b6ee23219fb7bd460afde52b239805
 
Binary file mercurial-tests/testData/rep2/hg/undo.dirstate has changed