git-annex/doc/todo/assistant_git_sync_laddering.mdwn

When the [[design/assistant]] is running on a pair of remotes, I've seen
them get out of sync, such that every pull and merge results in a conflict,
that then has to be auto-resolved. 

This seems similar to the laddering problem described in this old bug:
[[bugs/making_annex-merge_try_a_fast-forward]]

--[[Joey]]

Think I've fixed this. [[done]] --[[Joey]]
todos 2012-07-07 17:56:23 +00:00			`When the [[design/assistant]] is running on a pair of remotes, I've seen`
			`them get out of sync, such that every pull and merge results in a conflict,`
			`that then has to be auto-resolved.`

			`This seems similar to the laddering problem described in this old bug:`
			`[[bugs/making_annex-merge_try_a_fast-forward]]`

sync: Pushes the git-annex branch to remote/synced/git-annex, rather than directly to remote/git-annex. This fixes a problem I was seeing in the assistant where two remotes would attempt to sync with one another at the same time, and both failed pushing the diverged git-annex branch. Then when both tried to resolve the failed push, they each modified their git-annex branch, which again each blocked the other from pushing into it. The result was that the git-annex branches were perpetually diverged (despite having the same content!) and once the assistant fell into this trap, it couldn't get out and always had to do the slow push/fail/pull/merge/push/fail cycle. 2012-09-16 21:54:12 +00:00			`--[[Joey]]`

			`Think I've fixed this. [[done]] --[[Joey]]`