Mercurial > hg > RemoteEditor > REPSessionManager

diff 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
line wrap: on
line diff
--- a/rep/handler/Translator.java	Sat Sep 11 17:54:04 2010 +0900
+++ b/rep/handler/Translator.java	Sat Sep 11 18:01:04 2010 +0900
@@ -143,12 +143,12 @@
 
 	public boolean checkMergeConflict(REPCommand command) {
 		unMergedCmds.addFirst(command);
-		REPCommand prev = sentMergedList.remove();
-		assert (prev.seq==command.seq);
 		
 		if (mergeAgain) {
 			return true;
 		}
+		REPCommand prev = sentMergedList.remove();
+		assert (prev.seq==command.seq);
 		if(sentMergedList.size()==0) {
 			merge_mode=false;
 		}