Mercurial > hg > RemoteEditor > REPSessionManager

diff rep/handler/Editor.java @ 448:ed97273477a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sentList
author one
date Wed, 22 Sep 2010 17:42:47 +0900
parents 22a741c1fa2d
children 89a326696c54
line wrap: on
line diff
--- a/rep/handler/Editor.java	Wed Sep 22 17:14:35 2010 +0900
+++ b/rep/handler/Editor.java	Wed Sep 22 17:42:47 2010 +0900
@@ -243,7 +243,6 @@
 
 	private void startMerge(REPCommand command) {
 		preMergeCommand = new REPCommand(command);
-		preMergeCommand.string = "";
 		// merge は必須だが、EditorのCommand実装をテストするには邪魔なので、off に出来るようにする。
 		if (noMergeMode) {
 			checkQuit();
@@ -308,7 +307,7 @@
 			case REPCMD_DELETE: keep.cmd = REP.REPCMD_DELETE_ACK;break;
 			default: assert(false);
 			}
-			sentList.add(keep);
+			sentList.add(preMergeCommand);
 			//ServerMainLoop.logger.writeLog("Editor eid:"+eid+" sentList = "+sentList);
 			assert(sentList.size()<limit);
 			next.send(keep);