Mercurial > hg > RemoteEditor > REPSessionManager

diff rep/Session.java @ 484:7420dea70dd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Direct Merge first try
author one
date Wed, 20 Oct 2010 21:19:24 +0900
parents 795ef563f2a0
children
line wrap: on
line diff
--- a/rep/Session.java	Sat Oct 16 20:48:38 2010 +0900
+++ b/rep/Session.java	Wed Oct 20 21:19:24 2010 +0900
@@ -202,7 +202,7 @@
 				put(editor.eid,editor);
 			} else {
 				// update editor status
-				mine.merge(editor);
+				mine.mergeEditor(editor);
 			}
 		}	
 	}