followup and open bug

This commit is contained in:
Joey Hess 2015-07-06 16:20:57 -04:00
parent c59e29ae40
commit ba149973d6
2 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,12 @@
This bug seems to be somewhat reproducible:
1. Set up ~/annex using webapp, keep empty.
2. Add another local repo, eg /tmp/annex, and combine the 2 repositories.
Now files written to ~/annex should quickly appear in /tmp/annex, and
vice-versa. However, this seems not to happen at first. There's a pause
for some reason until changes start propigating. Apparently a push from
the repo that got the file to the other repo doesn't happen.
After this pause, syncing of changes starts happening quickly, as expected.
--[[Joey]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2015-07-06T20:07:08Z"
content="""
I think there might be some bug where the assistant does not notice that
the synced/master branch has been updated, and doesn't immediately merge it
into the local master branch. This seems to be borne out by your log.
[[bugs/assistant_sometimes_does_not_merge_changes_from_remote]] might be
related.
"""]]