From 5b1ea5fe5af25cd88c45a87d3bbe36ea7eed7145 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Jun 2014 11:32:13 -0400 Subject: 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. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 7a4f9d71e..931694fc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (5.20140614) UNRELEASED; urgency=medium + + * assistant: Fix one-way assistant->assistant sync in direct mode. + + -- Joey Hess Mon, 16 Jun 2014 11:28:42 -0400 + git-annex (5.20140613) unstable; urgency=medium * Ignore setsid failures. -- cgit v1.2.3