mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17528 commits 13 branches 442 tags 103 MiB
Commit graph

17528 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
810b26e1d9 fix windows code again (argh) 2014-02-06 17:58:43 -04:00
http://joeyh.name/
89055fabb9 removed 2014-02-06 21:53:40 +00:00
http://joeyh.name/
01c840cefd Added a comment 2014-02-06 21:53:23 +00:00
http://joeyh.name/
c452d71b4f Added a comment 2014-02-06 21:51:09 +00:00
Joey Hess
43d17632f6 remove workaround for old bug 
ef24751922 described a bug moving between
remotes in direct mode; I can no longer reproduce it with this strange
workaround removed. Also test suite still passes. Hope the broken code just
got fixed in the meantime.
 2014-02-06 17:36:14 -04:00
Joey Hess
897d877472 work around absNormPath not working on Windows 
When making git-annex links, we want unix-style paths in the link targets.
 2014-02-06 17:17:35 -04:00
Joey Hess
28cabd9909 Revert "work around absNormPath not working on Windows" 
This reverts commit 0fc3ad82c5.

That caused 2 other test cases to fail. Windows path slash issues are
horrible.
 2014-02-06 16:59:39 -04:00
Joey Hess
0fc3ad82c5 work around absNormPath not working on Windows 
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..
 2014-02-06 15:06:45 -04:00
http://joeyh.name/
eb266ace3c Added a comment 2014-02-06 17:26:59 +00:00
http://joeyh.name/
f1a9c036fd Added a comment 2014-02-06 17:11:00 +00:00
http://joeyh.name/
6bb1b2fda5 Added a comment 2014-02-06 17:05:46 +00:00
http://joeyh.name/
a2f0afcb21 Added a comment 2014-02-06 17:00:59 +00:00
http://joeyh.name/
76bed82dd2 Added a comment 2014-02-06 16:58:54 +00:00
Joey Hess
a44e01c29c --in can now refer to files that were located in a repository at some past date. For example, --in="here@{yesterday}" 2014-02-06 12:43:56 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
e86db3d2ab Added a comment 2014-02-06 13:30:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
9a4be193f6 2014-02-06 11:32:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
02ff4ffa0c Added a comment 2014-02-06 11:00:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
48efaa3223 2014-02-06 10:59:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmj9PMP_cTZvlEbxJ1eqeLCb25bTU6o1pg
c7fe67a592 removed 2014-02-05 22:48:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmj9PMP_cTZvlEbxJ1eqeLCb25bTU6o1pg
33d753f9fe 2014-02-05 22:24:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o
e39b90233b Added a comment: New git-annex package to blame 2014-02-05 14:23:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o
febee06155 Added a comment: Hash is the same 2014-02-05 11:13:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmfVOIl06X7NKio-NBYZ-cfw5LFVqHMX8o
afab5f14af 2014-02-05 11:06:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkRtPz8CAz_1sBR0Rf-b8OlQQ49v9JxOIE
a5330fbff5 Added a comment: re: Not an backup 2014-02-05 10:45:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o
0e8db60032 Describe symlink issue on Windows 2014-02-05 02:22:50 +00:00
Joey Hess
05745e88d2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-04 17:34:34 -04:00
Joey Hess
e20acd9f7a devblog 2014-02-04 17:34:05 -04:00
Joey Hess
751f496c11 add test case & fix conflict resolution bug on Windows & FAT 
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 1c997fd08c.
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.
 2014-02-04 17:24:12 -04:00
Joey Hess
88003c446b narrowing test case 2014-02-04 15:27:49 -04:00
Joey Hess
0be48c58e3 update 2014-02-04 15:13:25 -04:00
Joey Hess
8e81a7e906 add test case for windows sync push failure 
This adds a test for a failure mode seemingly specific to Windows
that was removed in 1c997fd08c, and puts it
in its own test case.
 2014-02-04 14:50:28 -04:00
Joey Hess
5d7777cbe2 set up git email config in clone repos too when running test 
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.
 2014-02-04 14:31:52 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
9455a05ef7 Added a comment 2014-02-04 14:05:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
827fc98e99 Added a comment 2014-02-04 14:04:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw
ceef16f1f5 Added a comment 2014-02-04 13:45:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8mE_yKvTHFnrQn4MZkvt7pHebyPRqN-E
682100a02f removed 2014-02-04 10:06:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8mE_yKvTHFnrQn4MZkvt7pHebyPRqN-E
994ebedaf2 Added a comment: Me too 2014-02-04 10:03:36 +00:00
139.80.40.12
1ec1029040 poll vote (Tahoe-LAFS) 2014-02-04 03:04:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawltxdgYMUK4CMJh3jC8AlegwyoiHA9Ka7o
1a6e591a9f Added a comment 2014-02-04 02:05:37 +00:00
Joey Hess
83e6fb7319 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-03 21:26:04 -04:00
Joey Hess
631eeea5a5 devblog 2014-02-03 21:25:33 -04:00
Joey Hess
2287c88bfd update 2014-02-03 21:24:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
90439c43d2 2014-02-03 22:04:58 +00:00
Joey Hess
617c63a213 fix broken test 
1c997fd08c 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.)
 2014-02-03 14:32:07 -04:00
Joey Hess
c91bbc9494 fix reversion on repo deletion 
A broken symlink would cause the mode setting to fail.
 2014-02-03 14:20:39 -04:00
Joey Hess
ec417b108d improve failure message 2014-02-03 12:23:05 -04:00
Joey Hess
1c997fd08c fix test suite to pass on windows 
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.
 2014-02-03 12:12:50 -04:00
Joey Hess
ecd9b6731e try harder to delete test dir on windows 2014-02-03 11:45:31 -04:00
Joey Hess
29bb04aa0d Windows: Fix deletion of repositories by test suite and webapp. 
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.
 2014-02-03 11:19:41 -04:00
Joey Hess
01df5ed31d Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-03 10:45:32 -04:00