Mercurial > hg > RemoteEditor > REPSessionManager

comparison rep/handler/Translator.java @ 440:c50cee354f62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge conflict
author one
date Sat, 11 Sep 2010 18:01:04 +0900
parents 5cbe1731f40c
children 15888d516f10
comparison
equal deleted inserted replaced
439:5cbe1731f40c 440:c50cee354f62
141 eid = _eid; 141 eid = _eid;
142 } 142 }
143 143
144 public boolean checkMergeConflict(REPCommand command) { 144 public boolean checkMergeConflict(REPCommand command) {
145 unMergedCmds.addFirst(command); 145 unMergedCmds.addFirst(command);
146
147 if (mergeAgain) {
148 return true;
149 }
146 REPCommand prev = sentMergedList.remove(); 150 REPCommand prev = sentMergedList.remove();
147 assert (prev.seq==command.seq); 151 assert (prev.seq==command.seq);
148
149 if (mergeAgain) {
150 return true;
151 }
152 if(sentMergedList.size()==0) { 152 if(sentMergedList.size()==0) {
153 merge_mode=false; 153 merge_mode=false;
154 } 154 }
155 return false; 155 return false;
156 } 156 }