Mercurial > hg > RemoteEditor > REPSessionManager

diff rep/translater/TranslaterImp1.java @ 271:5b7abc22e61a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
enum
author kono
date Thu, 11 Sep 2008 17:23:27 +0900
parents a187180e0106
children 6d172579a78d
line wrap: on
line diff
--- a/rep/translater/TranslaterImp1.java	Thu Sep 11 15:08:06 2008 +0900
+++ b/rep/translater/TranslaterImp1.java	Thu Sep 11 17:23:27 2008 +0900
@@ -86,7 +86,7 @@
 		String str = new String(cmd.string);
 		REPCommand retCmd = new REPCommand(cmd.cmd, cmd.sid, cmd.eid, cmd.seq, cmd.lineno, str.length(), str);
 		
-		retCmd.eid = REP.MERGE_EID;
+		retCmd.eid = REP.MERGE_EID.id;
 		
 		if (cmd.cmd==REP.REPCMD_INSERT) retCmd.cmd=REP.REPCMD_DELETE;
 		else if (cmd.cmd==REP.REPCMD_DELETE) retCmd.cmd=REP.REPCMD_INSERT;
@@ -259,13 +259,13 @@
 			returnCommand.add(createUndo(mergeAgainList.get(mergeAgainList.size() - i -1)));
 		}
 		for(REPCommand command : mergeAgainList){
-			if(command.eid == REP.MERGE_EID){
+			if(command.eid == REP.MERGE_EID.id){
 				returnCommand.add(command);
 			}
 		}
 		for(REPCommand command : mergeAgainList){
 			if(command.eid == eid){
-				command.eid = REP.MERGE_EID;
+				command.eid = REP.MERGE_EID.id;
 				returnCommand.add(command);
 			}
 		}