# HG changeset patch
# User ShoshiTAMAKI
# Date 1289294034 -32400
# Node ID 174bc0d217124ad3f0a89256d9a7f3b774425c4c
# Parent  64359341c04abeecce1009f7abf381def1abdba3
modified SimpleEditor.merge .commit

diff -r 64359341c04a -r 174bc0d21712 src/treecms/proto/simple/SimpleEditor.java
--- a/src/treecms/proto/simple/SimpleEditor.java	Mon Nov 08 17:34:44 2010 +0900
+++ b/src/treecms/proto/simple/SimpleEditor.java	Tue Nov 09 18:13:54 2010 +0900
@@ -28,11 +28,21 @@
 	
 	public boolean commit(boolean _force)
 	{
-		m_contents.set(m_tip);
+		if(_force){
+			m_contents.set(m_tip);
+			update();
+			return true;
+		}
+		return m_contents.compareAndSet(m_modified,m_tip);
+	}
+	
+	public void merge()
+	{
+		LinkedList<Node> log = new LinkedList<Node>(m_log);
 		update();
-		return true;
-		
-		// need to merge.
+		for(Node node : log){
+			edit(node);
+		}
 	}
 	
 	public void discard()