Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Translator.java @ 452:d0d2449000f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkAck
author one
date Thu, 23 Sep 2010 21:19:28 +0900
parents 21cb16b7f3df
children 629211b606e4
comparison
equal deleted inserted replaced
451:fa7d9ec2008e 452:d0d2449000f5
218 public boolean isMerging() { 218 public boolean isMerging() {
219 return merge_mode; 219 return merge_mode;
220 } 220 }
221 221
222 public void startMerge(REPCommand cmd) { 222 public void startMerge(REPCommand cmd) {
223 logger.writeLog("START MERGE command ="+cmd+ 223 logger.writeLog("Editor"+eid+": START MERGE command ="+cmd+
224 ((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():"")); 224 ((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():""));
225 merge_mode = true; 225 merge_mode = true;
226 } 226 }
227 227
228 /** 228 /**