Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | tweak | Joey Hess | 2012-06-28 |
| | |||
* | merge conflict resolution now working | Joey Hess | 2012-06-27 |
| | | | | | | | | | | | Avoid MVar deadlock issue, which I don't understand. Have not taken the time to debug it fully, because it turns out I don't need to resolve merge conflicts when a new branch ref is written... I think. Ensure the git-annex branch is merged when doing a manual pull. Otherwise it can get out of sync, since git-annex normally only merges it once per run. | ||
* | actually fetch from remote when doing a manual pull | Joey Hess | 2012-06-27 |
| | | | | forgot to do this | ||
* | automatic conflict resolution for assistant | Joey Hess | 2012-06-27 |
| | |||
* | Merge branch 'master' into assistant | Joey Hess | 2012-06-27 |
|\ | |||
| * | typo | Joey Hess | 2012-06-27 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus | 2012-06-27 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus | 2012-06-27 |
| | | |||
| * | typo | Joey Hess | 2012-06-27 |
| | | |||
| * | blog for the day | Joey Hess | 2012-06-27 |
| | | |||
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-27 |
|\| | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2012-06-27 |
| |\ | |||
| * \ | Merge branch 'automerge' | Joey Hess | 2012-06-27 |
| |\ \ | |||
| | * | | use "variant" rather than "version" | Joey Hess | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | While this word may be less familiar to some users, it avoids the connotation that version 2 is better than version 1, which is wrong when the two variants were conflicting. | ||
| | * | | better filenames for conflict resolution files | Joey Hess | 2012-06-27 |
| | | | | |||
| | * | | commit merge resolution | Joey Hess | 2012-06-27 |
| | | | | | | | | | | | | | | | | this is necessary so the sync can continue successfully with its push phase | ||
| | * | | fix file name | Joey Hess | 2012-06-27 |
| | | | | |||
| * | | | close | Joey Hess | 2012-06-27 |
| | | | | |||
| | * | | don't automerge when the symlinks cannot be parsed as keys | Joey Hess | 2012-06-27 |
| | | | | |||
| | * | | sync: Automatically resolves merge conflicts. | Joey Hess | 2012-06-27 |
| | | | | | | | | | | | | | | | | untested, but it compiles :) | ||
| | * | | properly handle deleted files when processing ls-files --unmerged | Joey Hess | 2012-06-27 |
| |/ / | |||
| * | | add ls-files --unmerged support | Joey Hess | 2012-06-27 |
| | | | |||
| | * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg | 2012-06-27 |
| | | | |||
| | * | Added a comment | http://joeyh.name/ | 2012-06-27 |
| | | | |||
| | * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE | 2012-06-27 |
| | | | |||
| | * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus | 2012-06-27 |
| | | | |||
| | * | Added a comment | http://joeyh.name/ | 2012-06-27 |
| |/ | |||
| * | git-config fileEncoding | Joey Hess | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | Accept arbitrarily encoded repository filepaths etc when reading git config output. This fixes support for remotes with unusual characters in their names. For example, a remote with a url of /tmp/çüş was previously skipped, because the filename wasn't encoded right so it didn't think it was available. And when setting the annex-uuid of a remote named "çüş", it used to add it under a mis-encoded form of the remote's name. Both these cases now work ok in my testing. | ||
| * | Got rid of the last place that did utf8 decoding. | Joey Hess | 2012-06-26 |
| | | | | | | | | | | Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/ although I don't know how to reproduce that bug. | ||
| * | Added a comment | http://joeyh.name/ | 2012-06-27 |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2012-06-26 |
| |\ | |||
* | | | Merge branch 'master' into assistant | Joey Hess | 2012-06-26 |
|\| | | |||
| * | | Better fix for unavailable local remotes | Joey Hess | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | Not including such remotes turned out to have other consequences, including annex-truselevel git config being ignored. Instead, add guards before each operation that might try to operate on such a repo. | ||
| | * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg | 2012-06-27 |
| |/ | |||
| * | blog for the day | Joey Hess | 2012-06-26 |
| | | |||
* | | use a TMVar | Joey Hess | 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 | Joey Hess | 2012-06-26 |
|\| | |||
| * | Avoid ugly failure mode when moving content from a local repository that is ↵ | Joey Hess | 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 | Joey Hess | 2012-06-26 |
| | | |||
* | | better data type for push records | Joey Hess | 2012-06-26 |
| | | | | | | | | Not yet plumbed thru | ||
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-26 |
|\| | | | | | | | | | Conflicts: GitAnnex.hs | ||
| * | Version build dependency on STM, and allow building without it, which ↵ | Joey Hess | 2012-06-26 |
| | | | | | | | | disables the watch command. | ||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670 | 2012-06-26 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670 | 2012-06-26 |
| | | |||
| * | blog for the day | Joey Hess | 2012-06-25 |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2012-06-25 |
| |\ | |||
* | | | fixup merges now done when needed | Joey Hess | 2012-06-25 |
| | | | |||
* | | | Merge branch 'master' into assistant | Joey Hess | 2012-06-25 |
|\| | | |||
* | | | add a push retry thread | Joey Hess | 2012-06-25 |
| | | | |||
* | | | reorg threads | Joey Hess | 2012-06-25 |
| | | |