Mercurial > hg > RemoteEditor > REPSessionManager

comparison test/mergertest/TestMerger.java @ 473:596cc0a3beea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new Merge Algorithm
author one
date Thu, 14 Oct 2010 16:15:03 +0900
parents b800b33c6988
children
comparison
equal deleted inserted replaced
472:2107530c3d72 473:596cc0a3beea
44 Logger.print(command); 44 Logger.print(command);
45 trans.transSendCmd(command); 45 trans.transSendCmd(command);
46 } 46 }
47 for(REPCommand command : othersCommandList){ 47 for(REPCommand command : othersCommandList){
48 Logger.print(command); 48 Logger.print(command);
49 trans.transReceiveCmd(null, command); 49 // trans.transReceiveCmd(null, command);
50 } 50 }
51 for(int i = 0; i < commandList.size(); i++){ 51 for(int i = 0; i < commandList.size(); i++){
52 trans.merge(this,null); 52 trans.merge(this,null);
53 System.out.println(); 53 System.out.println();
54 } 54 }