summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Revert "work around absNormPath not working on Windows"Gravatar Joey Hess2014-02-06
| | | | | | | This reverts commit 595e9a41cedbed40dfc6680d34ef6de5e3a2ff8e. That caused 2 other test cases to fail. Windows path slash issues are horrible.
* work around absNormPath not working on WindowsGravatar Joey Hess2014-02-06
| | | | | | Seems I punted on this while porting before. This hack relies on DOS not using / in filenames, it's effectively an alternate path separatr in at least current versions of windows..
* --in can now refer to files that were located in a repository at some past ↵Gravatar Joey Hess2014-02-06
| | | | date. For example, --in="here@{yesterday}"
* Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-02-06
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-02-06
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-06
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-06
|
* removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmj9PMP_cTZvlEbxJ1eqeLCb25bTU6o1pg2014-02-05
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmj9PMP_cTZvlEbxJ1eqeLCb25bTU6o1pg2014-02-05
|
* Added a comment: New git-annex package to blameGravatar https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o2014-02-05
|
* Added a comment: Hash is the sameGravatar https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o2014-02-05
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o2014-02-05
|
* Added a comment: re: Not an backupGravatar https://www.google.com/accounts/o8/id?id=AItOawkRtPz8CAz_1sBR0Rf-b8OlQQ49v9JxOIE2014-02-05
|
* Describe symlink issue on WindowsGravatar https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o2014-02-05
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-04
|\
* | devblogGravatar Joey Hess2014-02-04
| |
* | add test case & fix conflict resolution bug on Windows & FATGravatar Joey Hess2014-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in automatic merge conflict resolution code when used on a filesystem not supporting symlinks, which resulted in it losing track of the symlink bit of annexed files. This was the underlying bug that was causing another test to fail, which got worked around in f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d. I've chosen to keep 2 separate test cases since the old test case only detected the problem accidentially. Test suite passes on FAT & in windows, as well as on proper unix systems. This commit was sponsored by Ellis Whitehead.
* | narrowing test caseGravatar Joey Hess2014-02-04
| |
* | updateGravatar Joey Hess2014-02-04
| |
* | add test case for windows sync push failureGravatar Joey Hess2014-02-04
| | | | | | | | | | | | This adds a test for a failure mode seemingly specific to Windows that was removed in f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d, and puts it in its own test case.
* | set up git email config in clone repos too when running testGravatar Joey Hess2014-02-04
| | | | | | | | | | | | | | | | | | This fixes the problem of the environment variables apparently not being seen on Windows. I could probably remove the setting of the env vars from Test.hs now as this covers it better. Note that outside the test suite, git-annex on windows seems to manage to configure the repo so commits work on its own.
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-04
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-04
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2014-02-04
| |
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawm8mE_yKvTHFnrQn4MZkvt7pHebyPRqN-E2014-02-04
| |
| * Added a comment: Me tooGravatar https://www.google.com/accounts/o8/id?id=AItOawm8mE_yKvTHFnrQn4MZkvt7pHebyPRqN-E2014-02-04
| |
| * poll vote (Tahoe-LAFS)Gravatar 139.80.40.122014-02-04
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o2014-02-04
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-03
|\
* | devblogGravatar Joey Hess2014-02-03
| |
* | updateGravatar Joey Hess2014-02-03
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY2014-02-03
|/
* fix broken testGravatar Joey Hess2014-02-03
| | | | | | f5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d broke the mixed conflict resolution test. Since origin is no longer involved, both sides have to sync after pairing. (The sync before pairing is just to get a commit.)
* fix reversion on repo deletionGravatar Joey Hess2014-02-03
| | | | A broken symlink would cause the mode setting to fail.
* improve failure messageGravatar Joey Hess2014-02-03
|
* fix test suite to pass on windowsGravatar Joey Hess2014-02-03
| | | | | | | On windows, the sync of the second cloned repo to origin failed, because synced/master was a non-fast-forward. This may be a bug of its own, but it's not the issue that this test was intended to test, so disconnect the repos from origin before syncing.
* try harder to delete test dir on windowsGravatar Joey Hess2014-02-03
|
* Windows: Fix deletion of repositories by test suite and webapp.Gravatar Joey Hess2014-02-03
| | | | | | On Windows, a file that is not writable cannot be deleted even if in a directory with write perms. So git object files were not getting deleted when removing a git repository.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-03
|\
* | reorgGravatar Joey Hess2014-02-03
| |
| * Added a comment: Still have not found a reasonable solution for this myself.Gravatar https://launchpad.net/~timo-linux2014-02-03
| |
* | fix failing test case on WindowsGravatar Joey Hess2014-02-03
| | | | | | | | ensure file being modified is all read before it's opened for write
* | avoid using openFile when withFile can be usedGravatar Joey Hess2014-02-03
| | | | | | | | | | | | Potentially fixes some FD leak if an action on an opened file handle fails for some reason. There have been some hard to reproduce reports of git-annex leaking FDs, and this may solve them.
* | factor out utility functionGravatar Joey Hess2014-02-03
| |
* | comment spellingGravatar Joey Hess2014-02-03
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82014-02-03
| |
* | sync --content: Drop files from remotes that don't have them after getting them.Gravatar Joey Hess2014-02-02
| | | | | | | | | | | | Need to include the uuid of the local repo in the list of belived locations of a key after getting it, in order for the drop from remote to include it in the numcopies calculation.
* | update function name in commentGravatar Joey Hess2014-02-02
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-02-02
|\
* | sync --content: Reuse smart copy code from copy command, including handling ↵Gravatar Joey Hess2014-02-02
| | | | | | | | and repairing out of date location tracking info. Closes: #737480
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 23:11:30 +0000