diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-13 11:15:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-13 11:15:09 -0400 |
| commit | f9413b779ee821092af306f30fa9b6e668617432 (patch) | |
| tree | e7cfe8ff1b349d38744a93f1b56b156900e03b72 | |
| parent | 305445e614a9e730032c97f5658227353faf3c4b (diff) | |
| parent | b85f123f57a4d8a6a9615384e2fe2ce4e4c66cfa (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/failed_sync_with_direct_mode_repo.mdwn | 7 |
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]] |