# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1293112288 -10800
# Node ID 0587a0235612d30711e542da6cea9f02f745c698
# Parent  43db29903d63ee5f63984be893fd6f1932ec002e
Fix TW-15008. Show changed files in all merge commits.

diff -r 43db29903d63 -r 0587a0235612 mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Wed Dec 22 17:56:41 2010 +0300
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java	Thu Dec 23 16:51:28 2010 +0300
@@ -96,8 +96,6 @@
   }
 
   private Collection<ModifiedFile> computeModifiedFilesForMergeCommit(final Settings settings, final ChangeSet cur) throws VcsException {
-    if (!cur.containsFiles()) return Collections.emptyList();
-
     ChangedFilesCommand cfc = new ChangedFilesCommand(settings);
     cfc.setRevId(cur.getId());
     return cfc.execute();
diff -r 43db29903d63 -r 0587a0235612 mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Wed Dec 22 17:56:41 2010 +0300
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java	Thu Dec 23 16:51:28 2010 +0300
@@ -39,7 +39,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -361,7 +360,7 @@
 
     assertFiles(Arrays.asList("A dir1/file1.txt"), changes.get(0));
     assertFiles(Arrays.asList("A dir2/file2.txt"), changes.get(1));
-    Assert.assertEquals(changes.get(2).getChanges().toString(), 0, changes.get(2).getChangeCount());
+    assertFiles(Arrays.asList("A dir1/file1.txt", "A dir2/file2.txt"), changes.get(2));
   }
 
   public void test_collect_changes_merge_conflict() throws Exception {