update
This commit is contained in:
parent
2d7ebc0582
commit
1f09ae686e
2 changed files with 12 additions and 1 deletions
|
@ -125,6 +125,17 @@ Many races need to be dealt with by this code. Here are some of them.
|
|||
Not a problem; The removal event removes the old file from the index, and
|
||||
the add event adds the new one.
|
||||
|
||||
* Symlink appears, but is then deleted before it can be processed.
|
||||
|
||||
Leads to an ugly message, otherwise no problem:
|
||||
|
||||
./me: readSymbolicLink: does not exist (No such file or directory)
|
||||
|
||||
Here `me` is a file that was in a conflicted merge, which got
|
||||
removed as part of the resolution. This is probably coming from the watcher
|
||||
thread, which sees the newly added symlink (created by the git merge),
|
||||
but finds it deleted (by the conflict resolver) by the time it processes it.
|
||||
|
||||
## done
|
||||
|
||||
- on startup, add any files that have appeared since last run **done**
|
||||
|
|
|
@ -17,7 +17,7 @@ all the other git clones, at both the git level and the key/value level.
|
|||
1. Also, detect if a push failed due to not being up-to-date, pull,
|
||||
and repush. **done**
|
||||
2. Use a git merge driver that adds both conflicting files,
|
||||
so conflicts never break a sync.
|
||||
so conflicts never break a sync. **done**
|
||||
3. Investigate the XMPP approach like dvcs-autosync does, or other ways of
|
||||
signaling a change out of band.
|
||||
4. Add a hook, so when there's a change to sync, a program can be run
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue