Commit 52407a0
Summary: Rebase onto upstream v0.2.0 (database-primitive merge) + fix loro 1.12.0 API
- Rebase onto upstream/main ea1cbc6 (v0.2.0 tag, PR NodeDB-Lab#102 merge)
- Resolve pool.rs conflict: keep database-aware authenticate() signature
- Bump loro workspace dep =1.10.8 → =1.12.0 (loro-internal now at 1.12.0)
- Add From<loro::LoroError> for CrdtError to support ? on fork_at() Result
- Fix nodedb-crdt history.rs: fork_at() now returns Result in loro 1.12.0
- Regenerate Cargo.lock
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent 28da3f2 commit 52407a0
4 files changed
Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
131 | 131 | | |
132 | 132 | | |
133 | 133 | | |
134 | | - | |
| 134 | + | |
135 | 135 | | |
136 | 136 | | |
137 | 137 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
56 | 62 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
0 commit comments