Mercurial > hg > RemoteEditor > REPSessionManager

comparison test/mergertest/TestMerger.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 b800b33c6988
children
comparison
equal deleted inserted replaced
483:c792a1ebc0ff 484:7420dea70dd7
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(commandList.get(i));
53 System.out.println(); 53 System.out.println();
54 } 54 }
55 } 55 }
56 56
57 @Override 57 @Override