Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Translator.java @ 464:295c257ac073

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ack list separation
author one
date Fri, 01 Oct 2010 18:48:40 +0900
parents 629211b606e4
children c83af820eb62
comparison
equal deleted inserted replaced
463:3c2918368de3 464:295c257ac073
64 output.add( createUndo(cmd0) ); 64 output.add( createUndo(cmd0) );
65 } 65 }
66 66
67 sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1)); 67 sortedEditCmds = new TreeSet<REPCommand>(new REPCommandComparator(1));
68 logger.writeLog("sentList"+eid+":"+editor.getSentList()); 68 logger.writeLog("sentList"+eid+":"+editor.getSentList());
69 boolean merged = true;
70 for( REPCommand cmd0 : editor.getSentList()) { 69 for( REPCommand cmd0 : editor.getSentList()) {
71 if (cmd0.cmd==REP.SMCMD_START_MERGE) {
72 merged = false;
73 continue;
74 }
75 if (merged) continue;
76 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE) 70 if (cmd0.cmd==REP.REPCMD_INSERT || cmd0.cmd==REP.REPCMD_DELETE)
77 sortedEditCmds.add(cmd0); 71 sortedEditCmds.add(cmd0);
78 } 72 }
79 logger.writeLog("sortedMerge"+eid+":"+sortedEditCmds); 73 logger.writeLog("sortedMerge"+eid+":"+sortedEditCmds);
80 // logger.writeLog("Ediotr"+eid+" Merge:: sorted sent list => Eid="+eid+cmds+" ack="+prev); 74 // logger.writeLog("Ediotr"+eid+" Merge:: sorted sent list => Eid="+eid+cmds+" ack="+prev);