Mercurial > hg > RemoteEditor > REPSessionManager

changeset 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 dc9b2da06fa9
children 89a326696c54
files rep/handler/Editor.java rep/handler/Translator.java
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
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);
--- a/rep/handler/Translator.java	Wed Sep 22 17:14:35 2010 +0900
+++ b/rep/handler/Translator.java	Wed Sep 22 17:42:47 2010 +0900
@@ -86,14 +86,12 @@
 	 * Received all merge command ack
 	 */
 	public void endMerge() {
-		if (false) {
 		LinkedList<REPCommand> n = new LinkedList<REPCommand>();
 		for(int i=0;i< sortedEditCmds.size()-1;i++) {
 			n.addLast(unMergedCmds.get(i));
 		}
 		sortedEditCmds = null;
 		unMergedCmds = n;
-		}
 	}
 	/**
 	 * Sent optimized merged command list