summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2014-06-13 14:53:23 +0000
committerGravatar admin <admin@branchable.com>2014-06-13 14:53:23 +0000
commitb85f123f57a4d8a6a9615384e2fe2ce4e4c66cfa (patch)
tree6d46b964efd13335d92ea76aa9853e87425caa32
parent2858c246b52117a2f40bb97c11d61a4a96a90d36 (diff)
-rw-r--r--doc/bugs/failed_sync_with_direct_mode_repo.mdwn7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/bugs/failed_sync_with_direct_mode_repo.mdwn b/doc/bugs/failed_sync_with_direct_mode_repo.mdwn
new file mode 100644
index 000000000..970aa60ef
--- /dev/null
+++ b/doc/bugs/failed_sync_with_direct_mode_repo.mdwn
@@ -0,0 +1,7 @@
+Two clients, both in direct mode, both running assistant.
+
+When a change is made on A, the assistant commits it to annex/direct/master. But, the master branch is not changed.
+
+B notices there is a change, pulls from A. Gets annex/direct/master, but does not merge it into its local branch at all.
+
+[[!tag confirmed]]