mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/doc/bugs/failed_sync_with_direct_mode_repo.mdwn

10 lines
346 B
Text
Raw Normal View History

2014-06-13 14:53:23 +00:00
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]]
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.
2014-06-16 15:32:13 +00:00
> [[fixed|done]] --[[Joey]]
Reference in a new issue Copy permalink