diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-16 17:54:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-16 17:54:12 -0400 |
| commit | 601ee470af277ad3d0041b6ce425d808075dc997 (patch) | |
| tree | d15de1ea91f0bb7f4ddaa5d09324ee47cb0caae7 /debian | |
| parent | e61512f42da04f424b70a345d42976296a1a7360 (diff) | |
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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cc567e581..06e227472 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ git-annex (3.20120826) UNRELEASED; urgency=low rather than moving to .git/annex/bad/ * Avoid crashing on encoding errors in filenames when writing transfer info files and reading from checksum commands. + * sync: Pushes the git-annex branch to remote/synced/git-annex, rather + than directly to remote/git-annex. -- Joey Hess <joeyh@debian.org> Mon, 27 Aug 2012 13:27:39 -0400 |