followup and open bug

2 files changed, 24 insertions, 0 deletions

diff --git a/doc/bugs/assistant_sometimes_does_not_merge_changes_from_remote.mdwn b/doc/bugs/assistant_sometimes_does_not_merge_changes_from_remote.mdwn
new file mode 100644
index 000000000..1abc7ffcb
--- /dev/null
+++ b/doc/bugs/assistant_sometimes_does_not_merge_changes_from_remote.mdwn
@@ -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]]
diff --git a/doc/forum/Huge_differences_in_sync_times_in_different_directories_of_same_machines/comment_2_b3953f30fb817ee3753f888a871de51f._comment b/doc/forum/Huge_differences_in_sync_times_in_different_directories_of_same_machines/comment_2_b3953f30fb817ee3753f888a871de51f._comment
new file mode 100644
index 000000000..58d019be9
--- /dev/null
+++ b/doc/forum/Huge_differences_in_sync_times_in_different_directories_of_same_machines/comment_2_b3953f30fb817ee3753f888a871de51f._comment
@@ -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.
+"""]]