summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* use a TMVarGravatar Joey Hess2012-06-26
| | | | | | | SampleMVar won't work; between getting the current value and changing it, another thread could made a change, which would get lost. TMVar works well; this update situation is handled by atomic transactions.
* Merge branch 'master' into assistantGravatar Joey Hess2012-06-26
|\
| * Avoid ugly failure mode when moving content from a local repository that is ↵Gravatar Joey Hess2012-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not available. Prelude.undefined error message was introduced by bb4f31a0ee496ffb83d31cc56f8827e47605d763. It seems best to filter out local repositories that cannot be accessed from the list of remotes, rather than keeping them in and making every thing that uses the list have to deal with remotes that may have an unknown location. Besides fixing the error message, this also makes unavailable local remotes' names not be shown in various messages, including in git annex status output. Also, move --to an unavailable local repository now avoids some ugly errors like "changeWorkingDirectory: does not exist".
| * new bug I noticedGravatar Joey Hess2012-06-26
| |
* | better data type for push recordsGravatar Joey Hess2012-06-26
| | | | | | | | Not yet plumbed thru
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-26
|\| | | | | | | | | Conflicts: GitAnnex.hs
| * Version build dependency on STM, and allow building without it, which ↵Gravatar Joey Hess2012-06-26
| | | | | | | | disables the watch command.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-26
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-26
| |
| * blog for the dayGravatar Joey Hess2012-06-25
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-25
| |\
* | | fixup merges now done when neededGravatar Joey Hess2012-06-25
| | |
* | | Merge branch 'master' into assistantGravatar Joey Hess2012-06-25
|\| |
* | | add a push retry threadGravatar Joey Hess2012-06-25
| | |
* | | reorg threadsGravatar Joey Hess2012-06-25
| | |
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | |
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | |
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | |
| * | cabal: Only try to use inotify on Linux.Gravatar Joey Hess2012-06-25
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | |
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | |
| | * Added a comment: For the momentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-25
| | |
| | * Added a comment: Installation not working on OS X 10.6.8Gravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-25
| | |
| | * Added a comment: The fact that the keys changed causes merge conflictsGravatar https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I2012-06-25
| | |
| * | typoGravatar Joey Hess2012-06-24
| |/
| * add news item for git-annex 3.20120624Gravatar Joey Hess2012-06-24
| |
| * releasing version 3.201206243.20120624Gravatar Joey Hess2012-06-24
| |
| * Added a commentGravatar http://joeyh.name/2012-06-23
| |
* | noninteractive mergeGravatar Joey Hess2012-06-23
| |
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-23
|\|
| * fixedGravatar Joey Hess2012-06-23
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-23
| |\
| * | sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-23
| | |
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-23
| | |
* | | cleanupGravatar Joey Hess2012-06-23
| | |
* | | golfingGravatar Joey Hess2012-06-23
| | |
* | | licenseGravatar Joey Hess2012-06-23
| | |
| * | updateGravatar Joey Hess2012-06-23
| | |
| | * Added a comment: how is this different than rsync?Gravatar https://www.google.com/accounts/o8/id?id=AItOawlc1og3PqIGudOMkFNrCCNg66vB7s-jLpc2012-06-22
| |/
| * blog for the dayGravatar Joey Hess2012-06-22
| |
* | added a merger threadGravatar Joey Hess2012-06-22
| | | | | | | | | | | | Wow! I can create a file in repo a, and it instantly* shows up in repo b! * under 1 second anyway
* | the syncer now pushes out changes to remotes, in parallelGravatar Joey Hess2012-06-22
| | | | | | | | | | | | | | | | | | Note that, since this always pushes branch synced/master to the remote, it assumes that master has already gotten all the commits that are on the remote merged in. Otherwise, fast-forward prevention may prevent the push. That's probably ok, because the next stage is to automatically detect incoming pushes and merge.
| * updateGravatar Joey Hess2012-06-22
| |
* | stub syncer thread and commit channelGravatar Joey Hess2012-06-22
| |
* | add assistant commandGravatar Joey Hess2012-06-22
|/ | | | like watch, but more magic
* Added a comment: Homebrew instead of MacPortsGravatar https://www.google.com/accounts/o8/id?id=AItOawldKnauegZulM7X6JoHJs7Gd5PnDjcgx-E2012-06-22
|