Mercurial > hg4j

diff src/org/tmatesoft/hg/core/HgCommitCommand.java @ 708:4ffc17c0b534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge: tests for resolver and complex scenario. Enable commit for merged revisions. Reuse file revisions if nothing changed
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Tue, 20 Aug 2013 18:41:34 +0200
parents b4242b7e7dfe
children
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgCommitCommand.java	Fri Aug 16 19:22:59 2013 +0200
+++ b/src/org/tmatesoft/hg/core/HgCommitCommand.java	Tue Aug 20 18:41:34 2013 +0200
@@ -102,9 +102,6 @@
 		try {
 			int[] parentRevs = new int[2];
 			detectParentFromDirstate(parentRevs);
-			if (parentRevs[0] != NO_REVISION && parentRevs[1] != NO_REVISION) {
-				throw new HgBadArgumentException("Sorry, I'm not yet smart enough to perform merge commits", null);
-			}
 			HgWorkingCopyStatusCollector sc = new HgWorkingCopyStatusCollector(repo);
 			Record status = sc.status(HgRepository.WORKING_COPY);
 			if (status.getModified().size() == 0 && status.getAdded().size() == 0 && status.getRemoved().size() == 0) {