summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* more quickcheck funGravatar Joey Hess2012-12-19
|
* quickcheck test for transfer info read/write codeGravatar Joey Hess2012-12-19
| | | | Fixed a bug the quickcheck turned up.
* move old comments away so as not to scare usersGravatar Joey Hess2012-12-19
|
* renamed; not assistant specificGravatar Joey Hess2012-12-19
|
* updateGravatar Joey Hess2012-12-19
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-19
|\
* | improve pagespecGravatar Joey Hess2012-12-19
| |
| * Added a commentGravatar http://joeyh.name/2012-12-19
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-19
|\
* | Bugfix: Fixed bug parsing transfer info filesGravatar Joey Hess2012-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newline after the filename was included in it. This was generally benign -- mostly these filenames are just displayed, and the newline didn't matter. But in the assistant, it caused unexpected dropping of preferred content. A characteristic of this bug is that the drop was displayed like this: drop some_file ok
| * Added a commentGravatar http://edheil.wordpress.com/2012-12-19
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-19
|\
* | commentGravatar Joey Hess2012-12-19
| |
* | updateGravatar Joey Hess2012-12-19
| |
* | commentGravatar Joey Hess2012-12-19
| |
* | normalise associated filesGravatar Joey Hess2012-12-19
| | | | | | | | | | Sometimes ./file will be passed in, and sometimes file; need to treat these the same.
| * (no commit message)Gravatar spwhitton2012-12-19
|/
* blog for the dayGravatar Joey Hess2012-12-18
|
* partial and incomplete automatic merging in direct modeGravatar Joey Hess2012-12-18
| | | | Handles our file right, but not theirs.
* unusedGravatar Joey Hess2012-12-18
|
* updateGravatar Joey Hess2012-12-18
|
* direct mode merging works!Gravatar Joey Hess2012-12-18
| | | | | Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files.
* Merge branch 'master' into desymlinkGravatar Joey Hess2012-12-18
|\
| * vicfg: Quote filename. Closes: #696193Gravatar Joey Hess2012-12-18
| |
| * new autobuilderGravatar Joey Hess2012-12-17
| |
| * blog for the dayGravatar Joey Hess2012-12-17
| |
* | Merge branch 'master' into desymlinkGravatar Joey Hess2012-12-17
|\| | | | | | | | | | | Conflicts: debian/changelog doc/design/assistant/desymlink.mdwn
| * close fixed OSX issuesGravatar Joey Hess2012-12-17
| |
| * OSX Mountian Lion builds now availableGravatar Joey Hess2012-12-17
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-17
| |\
| * | move tip from forum to tipsGravatar Joey Hess2012-12-17
| | |
| | * Added a commentGravatar http://joeyh.name/2012-12-17
| |/
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-12-17
| |\
| | * Added a commentGravatar http://joeyh.name/2012-12-17
| | |
| | * Added a commentGravatar http://joeyh.name/2012-12-17
| | |
| * | back to $SHELL for OSX appGravatar Joey Hess2012-12-17
| | | | | | | | | | | | | | | This is safe because we no longer mess with LD_PRELOAD equivilants. Since the linux standalone bundle still does, it continues to run sh.
| | * Added a commentGravatar http://joeyh.name/2012-12-17
| | |
| | * Added a comment: OSX troublesGravatar https://www.google.com/accounts/o8/id?id=AItOawmYiJgOvC4IDYkr2KIjMlfVD9r_1Sij_jY2012-12-17
| |/
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY2012-12-17
| |
| * removing archive pages, which broke the blog and I don't wantGravatar Joey Hess2012-12-16
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY2012-12-16
| |
| * Added a comment: Thanks!Gravatar andy2012-12-16
| |
| * Added a commentGravatar http://edheil.wordpress.com/2012-12-16
| |
| * Added a commentGravatar http://edheil.wordpress.com/2012-12-16
| |
| * (no commit message)Gravatar andy2012-12-15
| |
| * (no commit message)Gravatar Steve2012-12-15
| |
| * calendar updateGravatar admin2012-12-15
| |
| * Added a commentGravatar http://edheil.wordpress.com/2012-12-15
| |
| * move away 2 old comments that I think are now addressed in the install ↵Gravatar Joey Hess2012-12-14
| | | | | | | | instructions
| * cabal: add missing depend to 'test-suite', guard against 'kqueue' on linuxGravatar Sergei Trofimovich2012-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following test failure: Preprocessing test suite 'test' for git-annex-3.20121211... Remote/Git.hs:42:8: Could not find module `Control.Concurrent.MSampleVar' It is a member of the hidden package `SafeSemaphore-0.9.0'. Perhaps you need to add `SafeSemaphore' to the build-depends in your .cabal file. Use -v to see a list of the files searched for. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>