mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
git-annex/Assistant/Threads
History
Joey Hess 501cc8623a 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.
2014-06-16 11:32:13 -04:00
..
Committer.hs assistant: Fix one-way assistant->assistant sync in direct mode. 2014-06-16 11:32:13 -04:00
ConfigMonitor.hs Added required content configuration. 2014-03-29 16:03:33 -04:00
Cronner.hs webapp: remind user when using repositories that lack consistency checks 2013-10-29 16:50:38 -04:00
DaemonStatus.hs webapp: Fix a race that sometimes caused alerts or other notifications to be missed if they occurred while a page was loading. 2013-03-27 14:56:20 -04:00
Glacier.hs hlint 2013-10-02 22:59:07 -04:00
Merger.hs annex.startupscan can be set to false to disable the assistant's startup scan. 2014-03-05 17:44:14 -04:00
MountWatcher.hs avoid build warning from new dbus 2014-04-26 18:57:51 -04:00
NetWatcher.hs avoid build warning from new dbus 2014-04-26 19:24:56 -04:00
PairListener.hs Improve local pairing behavior when two computers both try to start the pairing process separately. 2013-11-02 15:10:29 -04:00
ProblemFixer.hs webapp: remind user when using repositories that lack consistency checks 2013-10-29 16:50:38 -04:00
Pusher.hs automatically launch git repository repair 2013-10-27 16:42:13 -04:00
RemoteControl.hs export CreateProcess fields from Utility.Process 2014-06-10 19:20:14 -04:00
SanityChecker.hs assistant: Make sanity checker tmp dir cleanup code more robust. 2014-05-30 15:08:49 -04:00
TransferPoller.hs Put non-object tmp files in .git/annex/misctmp, leaving .git/annex/tmp for only partially transferred objects. 2014-02-26 16:52:56 -04:00
Transferrer.hs avoid repeatedly searching path to make batch command when running transferkeys 2013-12-01 15:37:51 -04:00
TransferScanner.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
TransferWatcher.hs annex.startupscan can be set to false to disable the assistant's startup scan. 2014-03-05 17:44:14 -04:00
Upgrader.hs Standalone builds now check gpg signatures before upgrading. 2014-04-23 13:30:30 -04:00
UpgradeWatcher.hs annex.startupscan can be set to false to disable the assistant's startup scan. 2014-03-05 17:44:14 -04:00
Watcher.hs replace (Key, Backend) with Key 2014-04-17 18:03:39 -04:00
WebApp.hs Fix build with wai 0.3.0. 2014-06-11 01:29:00 -04:00
XMPPClient.hs also show signal icon next to connected xmpp remotes 2014-04-09 15:51:00 -04:00
XMPPPusher.hs add two long-running XMPP push threads, no more inversion of control 2013-05-22 15:13:31 -04:00