Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Translator.java @ 456:629211b606e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delayed merge mode in translator
author one
date Thu, 23 Sep 2010 23:51:39 +0900
parents d0d2449000f5
children 295c257ac073
comparison
equal deleted inserted replaced
455:15c70d5e8886 456:629211b606e4
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("Editor"+eid+": START MERGE command ="+cmd+ 223 }
224
225 /**
226 * receive SMCMD_START_MERGE_ACK
227 */
228 public void mergeAck() {
229 logger.writeLog("Editor"+eid+": START MERGE "+
224 ((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():"")); 230 ((unMergedCmds.size()>0)?" and top of unMergedCmds = "+ unMergedCmds.getLast():""));
225 merge_mode = true; 231 merge_mode = true;
226 } 232 }
227 233
228 /**
229 * receive SMCMD_START_MERGE_ACK
230 */
231 public void mergeAck() {
232 }
233
234 234
235 235
236 236
237 } 237 }