Mercurial > hg > RemoteEditor > REPSessionManager

changeset 456:629211b606e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delayed merge mode in translator
author one
date Thu, 23 Sep 2010 23:51:39 +0900
parents 15c70d5e8886
children cf61ba25950b
files rep/handler/Translator.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
 	}