Mercurial > hg > RemoteEditor > REPSessionManager

diff rep/handler/Translator.java @ 464:295c257ac073

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ack list separation
author one
date Fri, 01 Oct 2010 18:48:40 +0900
parents 629211b606e4
children c83af820eb62
line wrap: on
line diff
--- a/rep/handler/Translator.java	Fri Oct 01 17:20:12 2010 +0900
+++ b/rep/handler/Translator.java	Fri Oct 01 18:48:40 2010 +0900
@@ -66,13 +66,7 @@
 
 		sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1));
 		logger.writeLog("sentList"+eid+":"+editor.getSentList());
-		boolean merged = true;
 		for( REPCommand cmd0 : editor.getSentList()) {
-			if (cmd0.cmd==REP.SMCMD_START_MERGE) {
-				merged = false;
-				continue;
-			}
-			if (merged) continue;
 			if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE)
 				sortedEditCmds.add(cmd0);
 		}