Mercurial > hg > RemoteEditor > REPSessionManager

comparison 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
comparison
equal deleted inserted replaced
426:1acc3dfde5d3 427:622a8e15ff40
54 //"aaa", "bbb", // "ccc", "ddd", "eee", 54 //"aaa", "bbb", // "ccc", "ddd", "eee",
55 }; 55 };
56 port = _port; 56 port = _port;
57 semaIP = new InetSocketAddress(_host, _port); 57 semaIP = new InetSocketAddress(_host, _port);
58 ns = REPLogger.singleton(); 58 ns = REPLogger.singleton();
59 // ns.setLogLevel(10);
59 this.name = name; 60 this.name = name;
60 cmds = cmdList; 61 cmds = cmdList;
61 if (master) { 62 if (master) {
62 this.master=true; 63 this.master=true;
63 text = new Text(txts); 64 text = new Text(txts);
282 break; 283 break;
283 case SMCMD_START_MERGE : 284 case SMCMD_START_MERGE :
284 // lock user input during merge (optional) 285 // lock user input during merge (optional)
285 inputLock = hasInputLock; 286 inputLock = hasInputLock;
286 cmd.cmd = REP.SMCMD_START_MERGE_ACK; 287 cmd.cmd = REP.SMCMD_START_MERGE_ACK;
288 ns.writeLog("BeforeMerge "+text);
287 sendCommand(cmd); 289 sendCommand(cmd);
288 break; 290 break;
289 case SMCMD_END_MERGE : 291 case SMCMD_END_MERGE :
290 inputLock = false; 292 inputLock = false;
293 ns.writeLog("AfterMerge "+text);
291 break; 294 break;
292 case SMCMD_QUIT_2 : 295 case SMCMD_QUIT_2 :
293 if (cmd.eid!=eid) { 296 if (cmd.eid!=eid) {
294 forwardCommand(cmd); 297 forwardCommand(cmd);
295 } else { 298 } else {