Mercurial > hg > RemoteEditor > REPSessionManager

diff rep/handler/Editor.java @ 436:5e3532db2e07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix enQ
author one
date Wed, 01 Sep 2010 11:43:21 +0900
parents 2b034d12170e
children 5cbe1731f40c
line wrap: on
line diff
--- a/rep/handler/Editor.java	Sat Jan 16 18:02:26 2010 +0900
+++ b/rep/handler/Editor.java	Wed Sep 01 11:43:21 2010 +0900
@@ -86,7 +86,6 @@
 			if (command.eid==eid) {
 				// Second Phase が終わって同期が終了。
 				checkAck(command);
-				// sentList.remove(0);
 				SessionManager.logger.writeLog("Complete "+command);
 				checkQuit();
 				return;
@@ -307,8 +306,7 @@
 	private void endMerge() {
 		REPCommand mergeEnd = new REPCommand(REP.SMCMD_END_MERGE,sid,eid,seq(),0,"");
 		send(mergeEnd);
-		// sentList.remove(0);
-		sentList.clear();
+		sentList.remove(0);
 		if (preMergeCommand.eid==eid) {
 			// First Phase End, send ACK
 			REPCommand keep = new REPCommand(preMergeCommand);