Mercurial > hg > Members > shoshi > TreeCMSv1

comparison src/treecms/proto/simple/SimpleEditor.java @ 29:174bc0d21712

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified SimpleEditor.merge .commit
author ShoshiTAMAKI
date Tue, 09 Nov 2010 18:13:54 +0900
parents 64359341c04a
children 02ef906d0341
comparison
equal deleted inserted replaced
28:64359341c04a 29:174bc0d21712
26 return m_contents.equals(m_modified); 26 return m_contents.equals(m_modified);
27 } 27 }
28 28
29 public boolean commit(boolean _force) 29 public boolean commit(boolean _force)
30 { 30 {
31 m_contents.set(m_tip); 31 if(_force){
32 m_contents.set(m_tip);
33 update();
34 return true;
35 }
36 return m_contents.compareAndSet(m_modified,m_tip);
37 }
38
39 public void merge()
40 {
41 LinkedList<Node> log = new LinkedList<Node>(m_log);
32 update(); 42 update();
33 return true; 43 for(Node node : log){
34 44 edit(node);
35 // need to merge. 45 }
36 } 46 }
37 47
38 public void discard() 48 public void discard()
39 { 49 {
40 m_modified = null; 50 m_modified = null;