# HG changeset patch # User Dmitry Neverov # Date 1338473063 -14400 # Node ID 2d3caaaa3e6bb4d4dbe02899ad500a809bba6ca6 # Parent 26b02b419f71eefd1ea2423a624595408012afb8 Don't ignore empty commits Empty commits are special and will be filtered out by checkout rules and graph in change log will have holes. diff -r 26b02b419f71 -r 2d3caaaa3e6b mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java --- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Tue May 29 09:05:36 2012 +0200 +++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupport.java Thu May 31 18:04:23 2012 +0400 @@ -572,12 +572,22 @@ for (ChangeSetRevision parent : parents) { result.addParentRevision(parent.getFullVersion()); } - if (result.getParentRevisions().size() > 1) - result.setCanBeIgnored(false); + setCanBeIgnored(result); return result; } + private void setCanBeIgnored(@NotNull ModificationData md) { + if (md.getParentRevisions().size() > 1) { + //don't ignore merge commits + md.setCanBeIgnored(false); + } else if (md.getChangeCount() == 0) { + //don't ignore empty commits + md.setCanBeIgnored(false); + } + } + + @NotNull private List getChangesets(@NotNull final HgVcsRoot root, @NotNull final String fromVersion, @Nullable final String toVersion) throws VcsException { if (toVersion == null)