Mercurial > hg > RemoteEditor > REPSessionManager

diff test/sematest/TestEditor.java @ 427:622a8e15ff40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge Worked ?
author one
date Sat, 02 Jan 2010 03:20:23 +0900
parents 1e58479b4170
children 1bb59652d89c
line wrap: on
line diff
--- a/test/sematest/TestEditor.java	Fri Jan 01 00:06:23 2010 +0900
+++ b/test/sematest/TestEditor.java	Sat Jan 02 03:20:23 2010 +0900
@@ -56,6 +56,7 @@
 		port = _port;
 		semaIP = new InetSocketAddress(_host, _port);
 		ns = REPLogger.singleton();
+		// ns.setLogLevel(10);
 		this.name = name;
 		cmds = cmdList;
 		if (master) {
@@ -284,10 +285,12 @@
 			// lock user input during merge (optional)
 			inputLock = hasInputLock;
 			cmd.cmd = REP.SMCMD_START_MERGE_ACK;
+			ns.writeLog("BeforeMerge "+text);
 			sendCommand(cmd);
 			break;
 		case SMCMD_END_MERGE :
 			inputLock = false;
+			ns.writeLog("AfterMerge "+text);
 			break;
 		case SMCMD_QUIT_2 :
 			if (cmd.eid!=eid) {