Change sync semantics a bit, update test

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9021 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Start rewriting Typewriter as a collaboration demo

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9022 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Continue working on collaboration support

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9023 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Tweak store notifications to be posted synchronously

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9024 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Typewriter: support for pulling from either document

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9025 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Handle missing cases for COEditingContext responding to store change notifications

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9026 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Add a few more tests to TestConcurrentChanges

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9027 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Fix a few bugs.. collaborative editing user-specific undo/redo working (for a simple test case anyway)

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9028 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Aristo theme: set up the radiobutton and checkbox images

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9029 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
update TODO

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9030 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Start to port some of the merge tests

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9031 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Port more of merge test

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9032 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Port a few more merge test cases...

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9033 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Port a few more merge test cases...

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9034 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Finish porting all of TestMerge

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9035 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
Add hack so EUI test suite passes

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9036 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
merge: fix one failing test, identify that we're not detecting sequence conflicts

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9037 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
investigate how to get sequence merge behaviour to match diff3

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9038 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
COBranch: Clean out some dead code. Add -rootObject to match COPersistentRoot. Handle missing cases for -hasChanges and -discardAllChanges, add tests.

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9039 7b3f36aa-e6db-49c1-8b4c-66eac1997e64
merging: add a resolveConflictsFavoringSourceIdentifier method

git-svn-id: http://svn.gna.org/svn/etoile/trunk/Etoile@9040 7b3f36aa-e6db-49c1-8b4c-66eac1997e64