diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-06-16 11:32:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-16 11:32:13 -0400 |
| commit | 5b1ea5fe5af25cd88c45a87d3bbe36ea7eed7145 (patch) | |
| tree | ecbba4af5cd2f7383bcd07f373c9fa99ca847cd8 /doc/bugs/failed_sync_with_direct_mode_repo.mdwn | |
| parent | f9413b779ee821092af306f30fa9b6e668617432 (diff) | |
assistant: Fix one-way assistant->assistant sync in direct mode.
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.
This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.
Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
Diffstat (limited to 'doc/bugs/failed_sync_with_direct_mode_repo.mdwn')
| -rw-r--r-- | doc/bugs/failed_sync_with_direct_mode_repo.mdwn | 2 |
1 files changed, 2 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 index 970aa60ef..879146deb 100644 --- a/doc/bugs/failed_sync_with_direct_mode_repo.mdwn +++ b/doc/bugs/failed_sync_with_direct_mode_repo.mdwn @@ -5,3 +5,5 @@ When a change is made on A, the assistant commits it to annex/direct/master. But 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]] + +> [[fixed|done]] --[[Joey]] |