Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | use a TMVar | 2012-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 assistant | 2012-06-26 | |
|\ | |||
| * | Avoid ugly failure mode when moving content from a local repository that is ↵ | 2012-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 noticed | 2012-06-26 | |
| | | |||
* | | better data type for push records | 2012-06-26 | |
| | | | | | | | | Not yet plumbed thru | ||
* | | Merge branch 'master' into assistant | 2012-06-26 | |
|\| | | | | | | | | | Conflicts: GitAnnex.hs | ||
| * | Version build dependency on STM, and allow building without it, which ↵ | 2012-06-26 | |
| | | | | | | | | disables the watch command. | ||
| * | (no commit message) | 2012-06-26 | |
| | | |||
| * | (no commit message) | 2012-06-26 | |
| | | |||
| * | blog for the day | 2012-06-25 | |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-06-25 | |
| |\ | |||
* | | | fixup merges now done when needed | 2012-06-25 | |
| | | | |||
* | | | Merge branch 'master' into assistant | 2012-06-25 | |
|\| | | |||
* | | | add a push retry thread | 2012-06-25 | |
| | | | |||
* | | | reorg threads | 2012-06-25 | |
| | | | |||
| | * | Added a comment | 2012-06-25 | |
| | | | |||
| | * | Added a comment | 2012-06-25 | |
| | | | |||
| | * | (no commit message) | 2012-06-25 | |
| | | | |||
| | * | Added a comment | 2012-06-25 | |
| | | | |||
| * | | cabal: Only try to use inotify on Linux. | 2012-06-25 | |
| | | | |||
| | * | (no commit message) | 2012-06-25 | |
| | | | |||
| | * | (no commit message) | 2012-06-25 | |
| | | | |||
| | * | Added a comment | 2012-06-25 | |
| | | | |||
| | * | (no commit message) | 2012-06-25 | |
| | | | |||
| | * | Added a comment: For the moment | 2012-06-25 | |
| | | | |||
| | * | Added a comment: Installation not working on OS X 10.6.8 | 2012-06-25 | |
| | | | |||
| | * | Added a comment: The fact that the keys changed causes merge conflicts | 2012-06-25 | |
| | | | |||
| * | | typo | 2012-06-24 | |
| |/ | |||
| * | add news item for git-annex 3.20120624 | 2012-06-24 | |
| | | |||
| * | releasing version 3.201206243.20120624 | 2012-06-24 | |
| | | |||
| * | Added a comment | 2012-06-23 | |
| | | |||
* | | noninteractive merge | 2012-06-23 | |
| | | |||
* | | Merge branch 'master' into assistant | 2012-06-23 | |
|\| | |||
| * | fixed | 2012-06-23 | |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-06-23 | |
| |\ | |||
| * | | sync: Avoid recent git's interactive merge. | 2012-06-23 | |
| | | | |||
| | * | (no commit message) | 2012-06-23 | |
| | | | |||
| | * | (no commit message) | 2012-06-23 | |
| | | | |||
* | | | cleanup | 2012-06-23 | |
| | | | |||
* | | | golfing | 2012-06-23 | |
| | | | |||
* | | | license | 2012-06-23 | |
| | | | |||
| * | | update | 2012-06-23 | |
| | | | |||
| | * | Added a comment: how is this different than rsync? | 2012-06-22 | |
| |/ | |||
| * | blog for the day | 2012-06-22 | |
| | | |||
* | | added a merger thread | 2012-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 parallel | 2012-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. | ||
| * | update | 2012-06-22 | |
| | | |||
* | | stub syncer thread and commit channel | 2012-06-22 | |
| | | |||
* | | add assistant command | 2012-06-22 | |
|/ | | | | like watch, but more magic | ||
* | Added a comment: Homebrew instead of MacPorts | 2012-06-22 | |
| |