changeset 591:c85cb270d59c

Use both parent commits for subrepo changes collecting Taking second parent into account results in less changes from subrepo.
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 17 Apr 2013 16:40:46 +0400
parents 87754c01d304
children e97a636cc9b7
files mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java	Wed Apr 17 14:56:05 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialCollectChangesPolicy.java	Wed Apr 17 16:40:46 2013 +0400
@@ -357,7 +357,7 @@
       try {
         ServerHgRepo repo = myVcs.createRepo(ctx, root);
         SubrepoConfigChangesAttributes builder = new SubrepoConfigChangesAttributes();
-        for (HgSubrepoConfigChange c : repo.getSubrepoConfigChanges(cset.getId(), asList(cset.getParents().get(0).getId()))) {
+        for (HgSubrepoConfigChange c : repo.getSubrepoConfigChanges(cset)) {
           fillSubrepoConfigChanges(ctx, builder, root, c);
         }
         attributes.putAll(builder.buildAttributes());