Mercurial > hg > Members > nobuyasu > jungle-network

comparison src/main/java/app/bbs/BulletinBoardJungleManager.java @ 139:c1d75b031b15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added EditMessageUseGetServlet
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Thu, 23 Jan 2014 21:46:40 +0900
parents 07106bbc6c17
children 29734d7d6521
comparison
equal deleted inserted replaced
138:07106bbc6c17 139:c1d75b031b15
48 } 48 }
49 Either<Error, JungleTreeEditor> either = null; 49 Either<Error, JungleTreeEditor> either = null;
50 JungleTree tree = jungle.getTreeByName(treeName); 50 JungleTree tree = jungle.getTreeByName(treeName);
51 do { 51 do {
52 JungleTreeEditor editor = tree.getLocalTreeEditor(); 52 JungleTreeEditor editor = tree.getLocalTreeEditor();
53
54 /* 53 /*
55 * Merge. 54 * Merge.
56 */ 55 */
57 int pos = calculatePosition(tree.getRootNode(), netLog.getTimeStamp()); 56 int pos = calculatePosition(tree.getRootNode(), netLog.getTimeStamp());
58 either = JungleUpdater.edit(editor, netLog, pos); 57 either = JungleUpdater.edit(editor, netLog, pos);