summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\
* | glacier: Pass --region to glacier checkpresent.Gravatar Joey Hess2014-03-04
| | | | | | | | | | I suppose this is not necessary when it has a local cache, so I didn't notice it was missing.
| * Added a commentGravatar http://joeyh.name/2014-03-05
| |
| * Added a commentGravatar http://joeyh.name/2014-03-05
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\
* | more conflict resolution testsGravatar Joey Hess2014-03-04
| |
* | styleGravatar Joey Hess2014-03-04
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA2014-03-05
|/
* devblogGravatar Joey Hess2014-03-04
|
* sync: Automatically resolve merge conflict between and annexed file and a ↵Gravatar Joey Hess2014-03-04
| | | | | | | | | | | | | | | | | | | regular git file. This is a new feature, it was not handled before, since it's a bit of an edge case. However, it can be handled exactly the same as a file/dir conflict, just leave the non-annexed item alone. While implementing this, the core resolveMerge' function got a lot simpler and clearer. Note especially that where before there was an asymetric call to stagefromdirectmergedir, now graftin is called symmetrically in both cases. And, in order to add that `graftin us`, the current branch needed to be known (if there is no current branch, there cannot be a merge conflict). This led to some cleanups of how autoMergeFrom behaved when there is no current branch. This commit was sponsored by Philippe Gauthier.
* add test case for merge conflict resolution between annexed and in-git fileGravatar Joey Hess2014-03-04
|
* added test for conflict resolution with a file that is both deleted and modifiedGravatar Joey Hess2014-03-04
|
* factor out Annex.AutoMerge from Command.SyncGravatar Joey Hess2014-03-04
|
* ideaGravatar Joey Hess2014-03-04
|
* fix test case to convert slashes for DOSGravatar Joey Hess2014-03-04
|
* improved direct mode dir/file conflicted merge resultion, using tree graftingGravatar Joey Hess2014-03-04
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\
* | much improved test and real fix for FAT symlink loss on conflicted mergeGravatar Joey Hess2014-03-04
| | | | | | | | | | | | | | | | | | | | | | I think that f5ce1a15d7a35b85ffa938ee950f4749bf445939 didn't quite manage to actually fix the bug, although I have not checked since its "fix" got redone. The test suite now actually checks the file staged in git is a symlink, rather than relying on the bug casing a later sync failure. This seems a more reliable way to detect it, and probably avoids a heisenbug in the test suite.
* | improved test for FAT symlink regressionsGravatar Joey Hess2014-03-04
| | | | | | | | | | The test case that was supposed to cover this did not.. It is for some other bug, which is apparently a bit of a heisenbug.
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-04
| |
* | fix environment propigation in windows test suiteGravatar Joey Hess2014-03-04
|/ | | | Let through HOME, etc when running git-annex from test suite.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-04
|\
* | finish fixing direct mode merge bug involving unstaged local filesGravatar Joey Hess2014-03-04
| | | | | | | | | | | | | | | | | | | | Added test cases for both ways this can happen, with a conflict involving a file, or a directory. Cleaned up resolveMerge to not touch the work tree in direct mode, which turned out to be the only way to handle things.. And makes it much nicer. Still need to run test suite on windows.
* | add test cases for the new direct mode merge bugGravatar Joey Hess2014-03-04
| |
| * Added a commentGravatar http://joeyh.name/2014-03-03
| |
* | fix a9067868a8594577ead2ecbe55f9563bef12f26d to handle annexed files in ↵Gravatar Joey Hess2014-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicted merge In the case of a conflicted merge where the remote adds a directory, and we have a file (which is checked in), resolveMerge' will create the link, and so the fix for a9067868a8594577ead2ecbe55f9563bef12f26d looked at that, thought it was an unannexed file (it's not in the oldref), and preserved it. This is a hacky fix. It would be better for resolveMerge' to not update the work tree, at least in direct mode, and only stage the changes, which mergeDirectCleanUp could then move into tree. I want to make that change, but this is not the time to do it.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-03
| |
* | rename for clarityGravatar Joey Hess2014-03-03
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M2014-03-03
| |
* | simplfyGravatar Joey Hess2014-03-03
|/
* fixed initial reported problem but not out of the woods yet in some related ↵Gravatar Joey Hess2014-03-03
| | | | cases
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-03
|\
* | sync: Fix bug in direct mode that caused a file not checked into git to be ↵Gravatar Joey Hess2014-03-03
| | | | | | | | deleted when merging with a remote that added a file by the same name. (Thanks, jkt)
| * (no commit message)Gravatar http://joeyh.name/2014-03-03
|/
* fix handling of nonexistant hookGravatar Joey Hess2014-03-03
|
* add link to darktable-git-annexGravatar Joey Hess2014-03-03
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk2014-03-03
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk2014-03-03
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2014-03-03
|
* number listGravatar Joey Hess2014-03-02
|
* decruftGravatar Joey Hess2014-03-02
|
* devblogGravatar Joey Hess2014-03-02
|
* pre-commit-annex hook script to automatically extract metadata from lots of ↵Gravatar Joey Hess2014-03-02
| | | | | | | | | | | | | | | | | | types of files Using the extract(1) program to do the heavy lifting. Decided to make git-annex run pre-commit-annex when committing. Since git-annex pre-commit also runs it, it'll be run when git commit is run too, via the pre-commit hook. This basically gives back the pre-commit hook that git-annex took away. The implementation avoids repeatedly looking for the hook script when the assistant is running and committing repeatedly; only checks if the hook is available once. To make the script simpler, made git-annex metadata -s field?=value only set a field when it's not already got a value. This commit was sponsored by bak.
* updateGravatar Joey Hess2014-03-02
|
* view: Refuse to enter a view when no branch is currently checked out.Gravatar Joey Hess2014-03-02
|
* updateGravatar Joey Hess2014-03-02
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-03-02
|\
* | doc improvementsGravatar Joey Hess2014-03-02
| |
* | fix combining of FIlterValuesGravatar Joey Hess2014-03-02
| |
* | vadd: Allow listing multiple desired values for a field.Gravatar Joey Hess2014-03-02
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 17:38:31 +0000