Orion Henry 
								
							 
						 
						
							
							
								
							
							
	68c593dda7  
						 
						
							
							
								
								
								cleanup readme  
							
							 
							
							
							
							
						 
						
							2020-04-16 08:11:12 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	d2aec176d9  
						 
						
							
							
								
								
								goals and issues markdown  
							
							 
							
							
							
							
						 
						
							2020-04-16 08:06:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	fe38f41569  
						 
						
							
							
								
								
								integrate skiplist into backend  
							
							 
							
							
							
							
						 
						
							2020-04-16 06:07:40 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	2180f4ac46  
						 
						
							
							
								
								
								cleanup  
							
							 
							
							
							
							
						 
						
							2020-04-13 21:27:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	f6da533b99  
						 
						
							
							
								
								
								cleanup  
							
							 
							
							
							
							
						 
						
							2020-04-13 21:14:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	50ec30bdba  
						 
						
							
							
								
								
								added skip list - not used yet  
							
							 
							
							
							
							
						 
						
							2020-04-13 20:21:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	
	
	be39105ec9 
 
						 
						
							
							
								
								
								Merge pull request  #13  from automerge/remove-object-id-str  
							
							 
							
							... 
							
							
							
							
							Remove ObjectID::Str and add some standard trait impls 
							
						 
						
							2020-04-13 11:58:30 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	0d885b2e79  
						 
						
							
							
								
								
								Merge branch 'remove-object-id-str' into frontend  
							
							 
							
							
							
							
						 
						
							2020-04-13 19:23:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	1fefbd029e  
						 
						
							
							
								
								
								Run clippy  
							
							 
							
							
							
							
						 
						
							2020-04-13 19:23:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	ebfc71a2f7  
						 
						
							
							
								
								
								Merge branch 'remove-object-id-str' into frontend  
							
							 
							
							
							
							
						 
						
							2020-04-13 19:20:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	d173aa3b1b  
						 
						
							
							
								
								
								Remove ObjectID::Str and add some standard trait impls  
							
							 
							
							
							
							
						 
						
							2020-04-13 19:13:24 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	1ad7dc9187  
						 
						
							
							
								
								
								WIP  
							
							 
							
							
							
							
						 
						
							2020-04-13 19:03:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	0e5bcb2999  
						 
						
							
							
								
								
								Remove ObjectID::Str  
							
							 
							
							
							
							
						 
						
							2020-04-13 19:02:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	344cfb2a9d  
						 
						
							
							
								
								
								WIP  
							
							 
							
							
							
							
						 
						
							2020-04-13 18:24:19 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	161cd1c827  
						 
						
							
							
								
								
								WIP  
							
							 
							
							
							
							
						 
						
							2020-04-13 16:39:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	
	
	3f8c8d097e 
 
						 
						
							
							
								
								
								Merge pull request  #12  from automerge/backend-tests  
							
							 
							
							... 
							
							
							
							
							Backend tests 
							
						 
						
							2020-04-13 07:19:08 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	
	
	bcbff29c0a 
 
						 
						
							
							
								
								
								Run cargo fmt  
							
							 
							
							
							
							
						 
						
							2020-04-10 19:12:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	
	
	fe9873f66b 
 
						 
						
							
							
								
								
								Tiny README fix  
							
							 
							
							
							
							
						 
						
							2020-04-10 19:09:31 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	
	
	02de5f6c8a 
 
						 
						
							
							
								
								
								Run clippy  
							
							 
							
							
							
							
						 
						
							2020-04-10 19:07:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	
	
	33e25f776d 
 
						 
						
							
							
								
								
								Don't change wasm stuff yet  
							
							 
							
							
							
							
						 
						
							2020-04-10 18:57:28 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	
	
	9daf1053e6 
 
						 
						
							
							
								
								
								Formatting and clippy  
							
							 
							
							
							
							
						 
						
							2020-04-10 18:55:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	0ed6586a04  
						 
						
							
							
								
								
								Port backend tests  
							
							 
							
							
							
							
						 
						
							2020-04-10 18:54:13 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	ce856d4213  
						 
						
							
							
								
								
								wip  
							
							 
							
							
							
							
						 
						
							2020-04-10 17:23:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	948ca78a8b  
						 
						
							
							
								
								
								Run cargo fmt  
							
							 
							
							
							
							
						 
						
							2020-04-10 14:36:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Good 
								
							 
						 
						
							
							
								
							
							
	5fbc23fd75  
						 
						
							
							
								
								
								Cleanup, add deserialization for DiffLink  
							
							 
							
							
							
							
						 
						
							2020-04-10 14:36:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	94a50fe68a  
						 
						
							
							
								
								
								webpack sync inline stuff  
							
							 
							
							
							
							
						 
						
							2020-04-08 15:33:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	c5916f97b7  
						 
						
							
							
								
								
								start work on async build  
							
							 
							
							
							
							
						 
						
							2020-04-06 13:43:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	41eea0bb02  
						 
						
							
							
								
								
								grab readme from performance branch  
							
							 
							
							
							
							
						 
						
							2020-04-05 10:39:42 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	f37f65dd08  
						 
						
							
							
								
								
								tools for making an asmjs version  
							
							 
							
							
							
							
						 
						
							2020-04-05 10:22:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kleppmann 
								
							 
						 
						
							
							
								
							
							
	2d7190394d  
						 
						
							
							
								
								
								Let the test suite specify the encode/decode functions  
							
							 
							
							... 
							
							
							
							
							Avoids the code in this repo loading its own version of Automerge, which
may be incompatible with the version run by the test suite (while the
binary data format is in flux) 
							
						 
						
							2020-04-02 21:38:44 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kleppmann 
								
							 
						 
						
							
							
								
							
							
	7b51847026  
						 
						
							
							
								
								
								Refactor wrapper to correspond more closely to JS backend  
							
							 
							
							... 
							
							
							
							
							Corresponds to automerge/automerge@c37cde232a  
							
						 
						
							2020-04-02 21:19:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kleppmann 
								
							 
						 
						
							
							
								
							
							
	88c96cfc8d  
						 
						
							
							
								
								
								Allow building without rimraf dependency  
							
							 
							
							
							
							
						 
						
							2020-04-02 21:19:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	86844cd43a  
						 
						
							
							
								
								
								move files back to old names  
							
							 
							
							
							
							
						 
						
							2020-04-02 13:12:23 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	06b234c889  
						 
						
							
							
								
								
								prep for npm package  
							
							 
							
							
							
							
						 
						
							2020-04-02 12:37:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	4911b5df53  
						 
						
							
							
								
								
								update yarn deps  
							
							 
							
							
							
							
						 
						
							2020-04-02 09:44:49 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	7233b23d86  
						 
						
							
							
								
								
								Merge branch 'wip' of github.com:automerge/automerge-rs into wip  
							
							 
							
							
							
							
						 
						
							2020-04-02 09:41:27 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	95cb760f79  
						 
						
							
							
								
								
								added clock to patch, some packaging cleanup  
							
							 
							
							
							
							
						 
						
							2020-04-02 09:39:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kleppmann 
								
							 
						 
						
							
							
								
							
							
	80a2e75e86  
						 
						
							
							
								
								
								Add clock to all patches  
							
							 
							
							... 
							
							
							
							
							Corresponds to automerge/automerge@29f307d2f2  
							
						 
						
							2020-04-02 17:12:35 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	
	
	f9142d6a1a 
 
						 
						
							
							
								
								
								Merge pull request  #11  from ept/wip  
							
							 
							
							... 
							
							
							
							
							Update to match Automerge performance branch 
							
						 
						
							2020-04-02 06:52:17 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kleppmann 
								
							 
						 
						
							
							
								
							
							
	74bfee8770  
						 
						
							
							
								
								
								Fix getChanges/getMissingChanges function confusion  
							
							 
							
							
							
							
						 
						
							2020-04-02 14:48:29 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Kleppmann 
								
							 
						 
						
							
							
								
							
							
	989e9e0e66  
						 
						
							
							
								
								
								Update to match Automerge performance branch  
							
							 
							
							... 
							
							
							
							
							Intended to go with commit 6c17526cec9712488e8820083bf0cbc5a36fc71e in
the Automerge repo. Currently still throws a lot of errors like:
"serde_json error: invalid type: null, expected a map at line 1 column 4" 
							
						 
						
							2020-04-02 13:03:46 +01:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	a85798cb8e  
						 
						
							
							
								
								
								try immutable data structures - move serde to its own file  
							
							 
							
							
							
							
						 
						
							2020-03-31 19:16:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	3642e990e3  
						 
						
							
							
								
								
								some simple optimizations  
							
							 
							
							
							
							
						 
						
							2020-03-31 15:54:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	af34d7ef36  
						 
						
							
							
								
								
								move undo stack and clock out of opset  
							
							 
							
							
							
							
						 
						
							2020-03-31 06:49:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	461c970e30  
						 
						
							
							
								
								
								light edits  
							
							 
							
							
							
							
						 
						
							2020-03-30 16:45:28 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	f8aa3e2fd5  
						 
						
							
							
								
								
								Reduce memory overhead for versions  
							
							 
							
							
							
							
						 
						
							2020-03-30 16:04:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	ccd90c1e61  
						 
						
							
							
								
								
								version.rc<op_set>  
							
							 
							
							
							
							
						 
						
							2020-03-30 15:27:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	fca6e1c09e  
						 
						
							
							
								
								
								move things out of op_set that are not needed  
							
							 
							
							
							
							
						 
						
							2020-03-30 15:15:30 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	9eed955d18  
						 
						
							
							
								
								
								keep a cache of elemids in the object  
							
							 
							
							
							
							
						 
						
							2020-03-30 14:32:38 -07:00  
						
						
							 
							
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Orion Henry 
								
							 
						 
						
							
							
								
							
							
	f7b3a57d20  
						 
						
							
							
								
								
								handle insert remove properly in diffs - preserve undo stack  
							
							 
							
							
							
							
						 
						
							2020-03-30 08:42:25 -07:00