Commit graph

4900 commits

Author SHA1 Message Date
Joey Hess
e0c02c8621 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 15:34:10 -04:00
Joey Hess
a3b0fb8330 close 2014-07-03 15:04:16 -04:00
http://joeyh.name/
cb08e06db5 Added a comment 2014-07-03 19:03:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
2d6342c076 2014-07-03 10:01:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
3517600b95 rename bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__.mdwn 2014-07-03 10:00:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
7838c6e139 rename bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn 2014-07-03 09:59:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
376a72553e Added a comment: Cconfirmed it was a LXDE issue, now fixed. 2014-07-03 09:58:24 +00:00
josch
84d74c6c13 2014-07-03 06:28:07 +00:00
josch
8c172ffb4a 2014-07-03 06:27:32 +00:00
Joey Hess
68f64de905 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-02 13:40:35 -04:00
http://joeyh.name/
d3054e3c04 Added a comment 2014-07-02 17:28:01 +00:00
http://joeyh.name/
2eb5a3654e Added a comment 2014-07-02 17:07:33 +00:00
Joey Hess
28d9151513
close 2014-07-02 13:06:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmmqnZzN5GP4w2m85_bSx7WSi0pMZvUVn8
a3761d6f89 2014-07-01 10:43:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
c4b43c778a Added a comment: Can't reproduce 2014-06-30 20:06:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
da0b36e607 2014-06-25 18:32:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
cbc899c934 2014-06-25 17:39:53 +00:00
Xyem
ef495b2e0e Added a comment 2014-06-24 10:05:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkpIIYg6Fl7OFsOHVPEchZYj68A3dk4lVg
0be60628db 2014-06-24 02:58:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm-YOFNhq40yWnZd5dYxqiYwS8d9hHI0Y8
92cf5ef90a 2014-06-23 06:01:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
93010144dd 2014-06-21 19:08:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
aed1056086 2014-06-21 13:57:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
bc99c5a203 git annex version added to bug report 2014-06-21 01:00:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
afc3789e2e link fixed 2014-06-21 00:55:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
416a3fa4e9 formatting fix 2014-06-21 00:51:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
cb2397918f fixed numeric list on my post 2014-06-21 00:45:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
a988a61b5b 2014-06-21 00:44:29 +00:00
http://joeyh.name/
7452ef1e25 Added a comment 2014-06-19 22:39:46 +00:00
Joey Hess
5b478722da make DistributionUpdate download build-version files and use them in the info files
Also automated downloading the builds, finally. I had done it by hand until
now.

Note that the Windows autobuilder has an expired cert, so it will refuse to
download from it currently. I have emailed its admin to get that fixed,
hopefully.

This commit was sponsored by Peter Hogg.
2014-06-18 15:24:18 -04:00
http://joeyh.name/
cef5c48e87 Added a comment 2014-06-18 18:12:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlEXAlu8qKv_FHYOv-uEohdGgMY_Lw-Ges
c2f1c63ef6 2014-06-18 12:28:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
ba952aca3c 2014-06-17 13:47:48 +00:00
Joey Hess
e8b4eb0cdb Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-16 11:33:00 -04:00
Joey Hess
501cc8623a assistant: Fix one-way assistant->assistant sync in direct mode.
When in direct mode, update the master branch after committing to the
annex/direct/master branch. Also, update the synced/master branch.

This fixes a topology A->B where both A and B are in direct mode and
running the assistant, and a change is made to B. Before this fix, A pulled
the changes from B, but since they were only on the annex/direct/master
branch, it did not merge them.

Note that I considered making the assistant merge the
remotes/B/annex/direct/master, but decided to keep it simple and only merge
the sync branches as before.
2014-06-16 11:32:13 -04:00
http://joeyh.name/
a78636e78a Added a comment 2014-06-16 15:10:42 +00:00
http://joeyh.name/
1dadac2390 Added a comment 2014-06-13 18:35:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
36ef4663af Added a comment 2014-06-13 18:30:25 +00:00
http://joeyh.name/
e9d411d0a6 2014-06-13 14:53:23 +00:00
Joey Hess
b30de0dfd2 work around a bug in git
http://marc.info/?l=git&m=140262402204212&w=2

This git bug manifested on FAT and Windows as the test suite failing in 3
places. All involved merge conflict resolution. It turned out that the
associated file mappings were getting messed up, and that happened because
this git bug lost track of what files were supposed to be symlinks.

This commit was sponsored by Eric Kidd.
2014-06-12 22:00:02 -04:00
http://joeyh.name/
c1ceafeef3 Added a comment 2014-06-12 20:07:30 +00:00
Joey Hess
9a001211a5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-12 15:52:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmXSkgjC_ypUQafVwvHTLsStrkiXH8CfHU
e4c4966231 2014-06-12 19:31:51 +00:00
Joey Hess
b291951180 merge in windows loststamp branch 2014-06-12 15:21:10 -04:00
Joey Hess
9dd380cf3b this just went from horrible to insanely weird 2014-06-12 15:17:32 -04:00
Joey Hess
4fe2e53f5b finish fixing windows timezone madness
Rather than calculating the TSDelta once, and caching it, this now
reads the inode sential file's InodeCache file once, and then each time a
new InodeCache is generated, looks at the sentinal file to get the current
delta.

This way, if the time zone changes while git-annex is running, it will
adapt.

This adds some inneffiency, but only on Windows, and only 1 stat per new
file added. The worst innefficiency is that `git annex status` and
`git annex sync` will now (on Windows) stat the inode sentinal file once per
file in the repo.

It would be more efficient to use getCurrentTimeZone, rather than needing
to stat the sentinal file. This should be easy to do, once the time
package gets my bugfix patch.

This commit was sponsored by Jürgen Lüters.
2014-06-12 13:54:08 -04:00
martin
aaf8045e56 Added a comment: In reply to comment 11 2014-06-12 09:22:54 +00:00
Joey Hess
3ee75d8738 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-11 19:07:26 -04:00
http://joeyh.name/
4b525889f1 Added a comment 2014-06-11 23:02:28 +00:00
http://joeyh.name/
2cc8a53815 Added a comment 2014-06-11 22:54:48 +00:00
Joey Hess
0c40bf5a94 confirmed 2014-06-11 18:20:58 -04:00