# HG changeset patch
# User one
# Date 1285253499 -32400
# Node ID 629211b606e4bdc6f3d44daaa60998fbcc893223
# Parent  15c70d5e8886ac328f668e2106866e2169ac9adf
delayed merge mode in translator

diff -r 15c70d5e8886 -r 629211b606e4 rep/handler/Translator.java
--- a/rep/handler/Translator.java	Thu Sep 23 23:42:48 2010 +0900
+++ b/rep/handler/Translator.java	Thu Sep 23 23:51:39 2010 +0900
@@ -220,15 +220,15 @@
 	}
 
 	public void startMerge(REPCommand cmd) {
-		logger.writeLog("Editor"+eid+": START MERGE command ="+cmd+
-				((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():""));
-		merge_mode = true;
 	}
 
 	/**
 	 *  receive SMCMD_START_MERGE_ACK
 	 */
 	public void mergeAck() {
+		logger.writeLog("Editor"+eid+": START MERGE "+
+				((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():""));
+		merge_mode = true;
 	}