summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix merge conflict resolution when both sides have the same keyGravatar Joey Hess2013-05-26
| | | | Still need to git rm the old file so git accepts the merge is resolved.
* fix Android build, broken for 2 daysGravatar Joey Hess2013-05-26
|
* correct recent fixGravatar Joey Hess2013-05-26
| | | | | 588a981e17461643b67f9a372703b9e0896b6e17's fix caused it to try to stage a symlink in .git/annex/tmp, oops
* sync: Fix double merge conflict resolution handling.Gravatar Joey Hess2013-05-26
| | | | | | | Ie, when there'a a conflicted merge we may get foo.variant-xxxx created in a merge. If a second merge conflict occurs on that new file, it was not falling back to putting in the whole key (which should stop the merge conflicts happening for good, but is ugly).
* typoGravatar Joey Hess2013-05-26
|
* avoid redundant CanPush messages with different shas being queued upGravatar Joey Hess2013-05-26
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-26
|\
* | reduce the amount of subdirectories created by the fuzz tester to saner limitGravatar Joey Hess2013-05-26
| |
* | make fuzztest honor annex.diskreserveGravatar Joey Hess2013-05-26
| |
* | fix warningGravatar Joey Hess2013-05-26
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw82013-05-26
|/
* more windows fixesGravatar Joey Hess2013-05-26
|
* typoGravatar Joey Hess2013-05-26
|
* fix windows buildGravatar Joey Hess2013-05-26
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc2013-05-26
|
* Added a commentGravatar annexuser2013-05-25
|
* fuzz test discovered a way automatic merge resultion can fail; fixGravatar Joey Hess2013-05-25
| | | | | It may be that the directory we need to make a symlink in, to resolve the merge, doesn't exist locally.
* fuzz tester: avoid deleting entire repository (had to happen eventually, right?)Gravatar Joey Hess2013-05-25
|
* fixGravatar Joey Hess2013-05-25
|
* fuzz improvementsGravatar Joey Hess2013-05-25
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-25
|\
* | tune frequencies to avoid enormous trees being createdGravatar Joey Hess2013-05-25
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o2013-05-25
|/
* blog for the daysGravatar Joey Hess2013-05-25
|
* make fuzz test also output its actions to stdoutGravatar Joey Hess2013-05-25
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-25
|\
* \ Merge branch 'robustness'Gravatar Joey Hess2013-05-25
|\ \
| * | make direct mode merge cleanup more robustGravatar Joey Hess2013-05-25
| | | | | | | | | | | | | | | | | | | | | | | | If the cleanup of a single file fails for some reason, continue to clean up other files. This could happen because of a race. The merge pulls in a change to a file, which gets changed locally at the same time.
| * | improve robustness of fromDirect and replaceFileGravatar Joey Hess2013-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Made fromDirect check that a file in the tree has good content (and is not a broken symlink either) before copying it to another file that has the same key. Made replaceFile clean up the temp file if the action that creates it, or the file replacement action fails.
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA2013-05-25
| | |
| | * Added a step I had to do on my own OS X machine with 10.6 in order for the ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs2013-05-25
| |/ |/| | | | | build to work.
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-25
|\ \
| * | Added a commentGravatar http://joeyh.name/2013-05-25
| | |
* | | some basic tests of preferred content expressions and standard groupsGravatar Joey Hess2013-05-25
| | |
* | | forgot to addGravatar Joey Hess2013-05-25
| | |
* | | fix handling of Not in the matcherGravatar Joey Hess2013-05-25
| | |
* | | content: New command line way to view and configure a repository's preferred ↵Gravatar Joey Hess2013-05-25
| | | | | | | | | | | | content settings.
| * | Added a comment: bind mountGravatar https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog2013-05-25
| | |
| * | Added a comment: Few other issuesGravatar http://yarikoptic.myopenid.com/2013-05-25
| | |
| * | Added a comment: Wheezy is affectedGravatar https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o2013-05-25
| | |
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA2013-05-25
| | |
| * | Added a comment: It did it again.Gravatar https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC02013-05-25
| | |
| * | Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA2013-05-25
| | |
| * | Added a comment: compressed storage/transfer -- gzip Content-TypeGravatar http://yarikoptic.myopenid.com/2013-05-25
|/ /
* | Improve error handling when getting uuid of http remotes to auto-ignore, ↵Gravatar Joey Hess2013-05-25
| | | | | | | | like with ssh remotes.
* | Added a commentGravatar http://joeyh.name/2013-05-25
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-05-25
|\ \
* | | assistant: Work around git-cat-file's not reloading the index after files ↵Gravatar Joey Hess2013-05-25
| | | | | | | | | | | | | | | | | | are staged. Argh.
* | | remove debug printGravatar Joey Hess2013-05-25
| | |
* | | refactorGravatar Joey Hess2013-05-24
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 10:45:09 +0000