mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

assistant: Fix one-way assistant->assistant sync in direct mode.

Browse source 
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.
This commit is contained in:
Joey Hess 2014-06-16 11:32:13 -04:00
parent 55870556df
commit 501cc8623a
5 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/failed_sync_with_direct_mode_repo.mdwn
View file

@ -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]]