# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1311856811 -14400
# Node ID 5cbb5ae712e98d055ca38cfac4ba3785962f2e52
# Parent  5fd8b9e79e5bcbdd4a85ba005b82783c09804112
Add test for TW-17797
* * *
update test

diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Mon Jul 25 13:04:07 2011 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Jul 28 16:40:11 2011 +0400
@@ -42,8 +42,11 @@
 
 @Test
 public class MercurialVcsSupportTest extends BaseMercurialTestCase {
+
   private MercurialVcsSupport myVcs;
   private ServerPaths myServerPaths;
+  private String myRep2Path = new File("mercurial-tests/testData/rep2").getAbsolutePath();
+
 
   @BeforeMethod
   protected void setUp() throws Exception {
@@ -366,6 +369,13 @@
     assertEquals("10:fc524efc2bc4", changes.get(1).getVersion());
   }
 
+  public void collectChanges_should_return_all_changes_from_branch() throws Exception {
+    VcsRootImpl defaultBranchRoot = createVcsRoot(myRep2Path, "default");
+    VcsRootImpl personalBranchRoot = createVcsRoot(myRep2Path, "personal-branch");
+    List<ModificationData> modifications = myVcs.collectChanges(defaultBranchRoot, "16:505c5b9d01e6", personalBranchRoot, "17:9ec402c74298", CheckoutRules.DEFAULT);
+    assertEquals(3, modifications.size());
+  }
+
   public void test_collect_changes_merge() throws Exception {
     VcsRootImpl vcsRoot = createVcsRoot(mergeCommittsRepo());
 
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial-tests/testData/README	Thu Jul 28 16:40:11 2011 +0400
@@ -0,0 +1,39 @@
+rep2 history:
+
+@    18:df04faa7575a merge personal-branch tip
+|\
+| o  17:9ec402c74298 another change to file.txt in personal-branch personal-branch
+| |
+o |  16:505c5b9d01e6 change file.txt back
+| |
+| o  15:96b78d73081d change file.txt in personal-branch personal-branch
+| |
+o |  14:78e67807f916 change file.txt
+| |
+| o  13:dec47d2d49bf create personal branch personal-branch
+|/
+o    12:1e620196c4b6 merge with test branch
+|\
+| o  11:48177654181c dir6 trunk
+| |
+o |  10:fc524efc2bc4 dir6 test
+| |
+o |  9:8c44244d6645 dir5 test
+|/
+o    8:b6e2d176fe8e merge with conflict
+|\
+| o  7:d6eaab231902 branch dir4
+| |
+o |  6:6066b677d026 file41
+| |
+o |  5:b4937926e2e3 dir4
+|/
+o    4:6eeb8974fe67 merge
+|\
+| o  3:2538c02bafeb dir2
+| |
+| o  2:db8a04d262f3 dir1
+| |
+o |  1:a3d15477d297 dir3
+|/
+o    0:e0ad3ddde5aa file.txt
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/branchheads.cache
--- a/mercurial-tests/testData/rep2/hg/branchheads.cache	Mon Jul 25 13:04:07 2011 +0400
+++ b/mercurial-tests/testData/rep2/hg/branchheads.cache	Thu Jul 28 16:40:11 2011 +0400
@@ -1,3 +1,4 @@
-48177654181c50307bfb333f824126f54858cf53 11
-48177654181c50307bfb333f824126f54858cf53 default
+df04faa7575acbe8e4cb112003e7db352a7589bf 18
+df04faa7575acbe8e4cb112003e7db352a7589bf default
 fc524efc2bc481e22365ab1452a41197060dbd9b test
+9ec402c74298567d252e70bd4ef2be8235be62cc personal-branch
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/dirstate
Binary file mercurial-tests/testData/rep2/hg/dirstate has changed
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/store/00changelog.i
Binary file mercurial-tests/testData/rep2/hg/store/00changelog.i has changed
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/store/00manifest.i
Binary file mercurial-tests/testData/rep2/hg/store/00manifest.i has changed
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/store/data/file.txt.i
Binary file mercurial-tests/testData/rep2/hg/store/data/file.txt.i has changed
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/store/undo
Binary file mercurial-tests/testData/rep2/hg/store/undo has changed
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/tags.cache
--- a/mercurial-tests/testData/rep2/hg/tags.cache	Mon Jul 25 13:04:07 2011 +0400
+++ b/mercurial-tests/testData/rep2/hg/tags.cache	Thu Jul 28 16:40:11 2011 +0400
@@ -1,2 +1,2 @@
-12 1e620196c4b6ee23219fb7bd460afde52b239805
+18 df04faa7575acbe8e4cb112003e7db352a7589bf
 
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial-tests/testData/rep2/hg/undo.dirstate
Binary file mercurial-tests/testData/rep2/hg/undo.dirstate has changed
diff -r 5fd8b9e79e5b -r 5cbb5ae712e9 mercurial.ipr
--- a/mercurial.ipr	Mon Jul 25 13:04:07 2011 +0400
+++ b/mercurial.ipr	Thu Jul 28 16:40:11 2011 +0400
@@ -28,6 +28,9 @@
     <option name="USE_USER_FILTER" value="false" />
     <option name="USER" value="" />
   </component>
+  <component name="ClearCaseSharedConfig">
+    <option name="myUseUcmModel" value="true" />
+  </component>
   <component name="CodeStyleProjectProfileManger">
     <option name="PROJECT_PROFILE" />
     <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
@@ -108,12 +111,13 @@
     <option name="PROJECT_PROFILE" value="Project Default" />
     <option name="USE_PROJECT_PROFILE" value="true" />
     <version value="1.0" />
-    <list size="5">
+    <list size="6">
       <item index="0" class="java.lang.String" itemvalue="TYPO" />
-      <item index="1" class="java.lang.String" itemvalue="INFO" />
-      <item index="2" class="java.lang.String" itemvalue="WARNING" />
-      <item index="3" class="java.lang.String" itemvalue="ERROR" />
-      <item index="4" class="java.lang.String" itemvalue="SERVER PROBLEM" />
+      <item index="1" class="java.lang.String" itemvalue="WEAK WARNING" />
+      <item index="2" class="java.lang.String" itemvalue="INFO" />
+      <item index="3" class="java.lang.String" itemvalue="WARNING" />
+      <item index="4" class="java.lang.String" itemvalue="ERROR" />
+      <item index="5" class="java.lang.String" itemvalue="SERVER PROBLEM" />
     </list>
   </component>
   <component name="JavadocGenerationManager">