From 601ee470af277ad3d0041b6ce425d808075dc997 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Sep 2012 17:54:12 -0400 Subject: 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. --- doc/todo/assistant_git_sync_laddering.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/todo') diff --git a/doc/todo/assistant_git_sync_laddering.mdwn b/doc/todo/assistant_git_sync_laddering.mdwn index f210d41f6..7dbc6480a 100644 --- a/doc/todo/assistant_git_sync_laddering.mdwn +++ b/doc/todo/assistant_git_sync_laddering.mdwn @@ -5,4 +5,6 @@ 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]] +--[[Joey]] + +Think I've fixed this. [[done]] --[[Joey]] -- cgit v1.2.3