diff --git a/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java b/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java
index 0da3060b5d..37298809ee 100644
--- a/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java
+++ b/scm-test/src/main/java/sonia/scm/repository/client/HgRepositoryClient.java
@@ -133,11 +133,16 @@ public class HgRepositoryClient extends AbstractRepositoryClient
   @Override
   public void commit(String message) throws RepositoryClientException
   {
-    SimpleCommand cmd = new SimpleCommand(hg, "-R",
-                          localRepository.getAbsolutePath(), "commit", "-m",
-                          message);
+    SimpleCommand cmd = null;
+
+    if (pendingCommit)
+    {
+      cmd = new SimpleCommand(hg, "-R", localRepository.getAbsolutePath(),
+                              "commit", "-m", message);
+      execute(cmd);
+      pendingCommit = false;
+    }
 
-    execute(cmd);
     cmd = new SimpleCommand(hg, "-R", localRepository.getAbsolutePath(),
                             "push", remoteURL);
     execute(cmd);
@@ -173,6 +178,7 @@ public class HgRepositoryClient extends AbstractRepositoryClient
                           new File(localRepository, file).getAbsolutePath());
 
     execute(cmd);
+    pendingCommit = true;
   }
 
   /**
@@ -218,6 +224,9 @@ public class HgRepositoryClient extends AbstractRepositoryClient
   /** Field description */
   private String hg;
 
+  /** Field description */
+  private boolean pendingCommit = false;
+
   /** Field description */
   private String remoteURL;
 }