Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | minor optimisation and warning fix | Joey Hess | 2013-05-20 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-20 |
|\ | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-20 |
| | | |||
* | | direct mode bug fix: After a conflicted merge was automatically resolved, ↵ | Joey Hess | 2013-05-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the content of a file that was already present could incorrectly be replaced with a symlink. The bug was in movein, which just replaceFile'd the file with a symlink, even if it already had the desired content, before trying to pull the content out of the annex and replace the symlink with it. That was ok-ish for non conflicted merges, where if the file existed it would be an old version of the content. But for conflicted merges, the automatic merge resolver has already run, and will have already put the desired content into the file for the local variant. Also, made removeDirect not trust that the associated files map is correct. Only if it can verify that another file has the content will it not move it into .git/annex/objects. | ||
| * | Added a comment | http://joeyh.name/ | 2013-05-20 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-20 |
| | | |||
| * | Added a comment | http://edheil.wordpress.com/ | 2013-05-20 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-20 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 |
| | | |||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-20 |
|\| | |||
| * | poll vote (/sdcard/annex) | 213.138.67.85 | 2013-05-20 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 |
| | | |||
| * | Added a comment | http://edheil.wordpress.com/ | 2013-05-20 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY | 2013-05-20 |
| | | |||
* | | debian architecture build fun | Joey Hess | 2013-05-19 |
| | | |||
* | | avoid failing build if cabal failed to update | Joey Hess | 2013-05-19 |
|/ | |||
* | fix windows build | Joey Hess | 2013-05-19 |
| | |||
* | stupid windows.. | Joey Hess | 2013-05-19 |
| | |||
* | seems windows sh doesn't properly handle set -e in functions | Joey Hess | 2013-05-19 |
| | |||
* | hmm | Joey Hess | 2013-05-19 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 |
|\ | |||
* | | do a clean build if incremental fails | Joey Hess | 2013-05-19 |
| | | |||
| * | add nntp remote page | http://joeyh.name/ | 2013-05-20 |
| | | |||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 |
|\| | |||
* | | blog for the day | Joey Hess | 2013-05-19 |
| | | |||
* | | remove unnecessary bracketIO | Joey Hess | 2013-05-19 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-19 |
|/ | |||
* | update | Joey Hess | 2013-05-19 |
| | |||
* | Allow building with gpg2. | Joey Hess | 2013-05-19 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 |
|\ | |||
| * | removed | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2013-05-19 |
| | | |||
| * | Add note about no webapp in Raring | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2013-05-19 |
| | | |||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 |
|\| | |||
| * | Added a comment: Official Raring build also does not have the Assistant enabled | https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o | 2013-05-19 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ | 2013-05-19 |
| | | |||
* | | idea | Joey Hess | 2013-05-19 |
| | | |||
| * | Added a comment | http://me.tinco.nl/ | 2013-05-19 |
| | | |||
* | | moreinfo | Joey Hess | 2013-05-19 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-19 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-19 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-05-19 |
|\ | |||
* | | close; was wrong password | Joey Hess | 2013-05-19 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-19 |
| | | |||
| * | removed | http://joeyh.name/ | 2013-05-19 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-05-19 |
| | | |||
| * | Added a comment | http://me.tinco.nl/ | 2013-05-19 |
|/ | |||
* | move todo item that wasn't to the forum, with a better title | Joey Hess | 2013-05-19 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-05-19 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-05-19 |
| |