summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* version dep on yesod-default, otherwise cabal explodes4.20130521.1Gravatar Joey Hess2013-05-23
| | | | Will be re-releasing the last version to hackage with a .1 with this fix.
* releasing version 4.201305214.20130521Gravatar Joey Hess2013-05-21
|
* fix quotesGravatar Joey Hess2013-05-21
|
* lift megaannex comment into tip, etcGravatar Joey Hess2013-05-21
|
* fix windows buildGravatar Joey Hess2013-05-21
|
* better nukefileGravatar Joey Hess2013-05-21
| | | | | Fixed handling of case when file does not exist to work like it did before, and avoid an excess stat call.
* Merge remote-tracking branch 'origin/master'Gravatar Joey Hess2013-05-21
|\
* | better nukeFileGravatar Joey Hess2013-05-21
| | | | | | | | This fixes a bug where a direct mode sync fails to delete broken symlinks.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-21
| |
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-21
| |
| * Added a comment: Usage of mega hookGravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-21
| |
| * Added a comment: Look what i madeGravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-21
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY2013-05-21
| |
| * Added a comment: Same error with AndroidGravatar https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs2013-05-21
|/
* flickrGravatar Joey Hess2013-05-20
|
* mention autobuild fixesGravatar Joey Hess2013-05-20
|
* blog for the dayGravatar Joey Hess2013-05-20
|
* fix warningGravatar Joey Hess2013-05-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-20
|\
* | closeGravatar Joey Hess2013-05-20
| |
| * Added a commentGravatar http://joeyh.name/2013-05-20
|/
* Detect bad content in ~/.config/git-annex/program and look in PATH instead.Gravatar Joey Hess2013-05-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-20
|\
* | update inode cache after copying contentGravatar Joey Hess2013-05-20
| | | | | | | | | | | | | | This was also tripped by the test suite's automatic conflict resolution test. Which also shows BTW that an unnecessary copy of content is done sometimes when merging in direct mode. Not going to try to speed that up now.
* | didn't quite get removeDirect right before, this passes test suiteGravatar Joey Hess2013-05-20
| |
* | add a test case for merge conflict automatic resolutionGravatar Joey Hess2013-05-20
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
|/
* Fix a bug in the git-annex branch handling code that could cause info from a ↵Gravatar Joey Hess2013-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote to not be merged and take effect immediately. This bug was turned up by the test suite, running fsck in direct mode. A repository was cloned, was put into direct mode, was fscked, and fsck incorrectly said that no copy existed of a file, that was actually present in origin. This turned out to occur because fsck first did a Annex.Branch.change, recording that it did not locally have the file. That was recorded in the journal. Since neither the git annex direct not the fsck had yet needed to read any info from the branch, but had only made changes to it, the origin/git-annex branch was not yet merged in. So the journal got a location log entry written to it, but this did not include the location log info for the origin. When fsck then did a Annex.Branch.get, it trusted the journal was cosnsitent, and returned it, again w/o merging from origin/git-annex. This latter behavior is the actual bug. Refer to commit e9bfa8eaed3ff59a4c0bc8d4d677bc493177807c for the thinking behind it being ok to make a change to a file on the branch, without first merging the branch. That thinking still stands. However, it means that files in the journal cannot be trusted to be consistent if the branch has not been merged. So, to fix, just enure the branch gets merged, even when reading from the journal. In tests, this does not seem to cause any extra merging. Except, of course, in the one case described above. But git annex add, etc, are able to make changes w/o first merging the branch.
* run the test suite twice, once in direct modeGravatar Joey Hess2013-05-20
| | | | | On a filesystem that only supports direct mode, it will test direct mode twice, but oh well.
* minor optimisation and warning fixGravatar Joey Hess2013-05-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-20
|\
| * Added a commentGravatar http://joeyh.name/2013-05-20
| |
* | direct mode bug fix: After a conflicted merge was automatically resolved, ↵Gravatar Joey Hess2013-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 commentGravatar http://joeyh.name/2013-05-20
| |
| * Added a commentGravatar http://joeyh.name/2013-05-20
| |
| * Added a commentGravatar http://edheil.wordpress.com/2013-05-20
| |
| * Added a commentGravatar http://joeyh.name/2013-05-20
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-20
|\|
| * poll vote (/sdcard/annex)Gravatar 213.138.67.852013-05-20
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| |
| * Added a commentGravatar http://edheil.wordpress.com/2013-05-20
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY2013-05-20
| |
* | debian architecture build funGravatar Joey Hess2013-05-19
| |
* | avoid failing build if cabal failed to updateGravatar Joey Hess2013-05-19
|/
* fix windows buildGravatar Joey Hess2013-05-19
|
* stupid windows..Gravatar Joey Hess2013-05-19
|
* seems windows sh doesn't properly handle set -e in functionsGravatar Joey Hess2013-05-19
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 16:46:10 +0000