Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/REPNode.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 87ae0424a62a
children cc262a519b8a
comparison
equal deleted inserted replaced
483:c792a1ebc0ff 484:7420dea70dd7
94 } 94 }
95 public void setChannel(REPSocketChannel<REPCommand> channel) { 95 public void setChannel(REPSocketChannel<REPCommand> channel) {
96 this.channel = channel; 96 this.channel = channel;
97 } 97 }
98 98
99 public void merge(REPNode editor) { 99 public void mergeEditor(REPNode editor) {
100 if (sid==-1) sid = editor.sid; 100 if (sid==-1) sid = editor.sid;
101 if (file==null) file = editor.file; 101 if (file==null) file = editor.file;
102 if (host==null) host = editor.host; 102 if (host==null) host = editor.host;
103 } 103 }
104 104