Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/Editor.java @ 337:5ba5b7a9761b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use REPLogger
author kono
date Sun, 12 Oct 2008 18:42:18 +0900
parents 36faf76a087c
children a9a740e685fa
comparison
equal deleted inserted replaced
336:d00cb51ba652 337:5ba5b7a9761b
70 void checkReturnedCommand(REPCommand command) { 70 void checkReturnedCommand(REPCommand command) {
71 REPCommand prev = sentList.remove(0); 71 REPCommand prev = sentList.remove(0);
72 if (prev==null || prev.seq != command.seq || prev.eid!=command.eid) { 72 if (prev==null || prev.seq != command.seq || prev.eid!=command.eid) {
73 String err = "Editor.checkReturnedCommand() : command = " + command + " prev="; 73 String err = "Editor.checkReturnedCommand() : command = " + command + " prev=";
74 err += prev==null?"null":prev.toString(); 74 err += prev==null?"null":prev.toString();
75 System.out.println(err); 75 SessionManager.logger.writeLog(err);
76 assert(false); 76 assert(false);
77 } 77 }
78 78
79 // START_MERGE を送る 79 // START_MERGE を送る
80 REPCommand cmd = new REPCommand(REP.SMCMD_START_MERGE,command.sid,REP.SM_EID.id,seq(),0,""); 80 REPCommand cmd = new REPCommand(REP.SMCMD_START_MERGE,command.sid,REP.SM_EID.id,seq(),0,"");