Commit graph

8225 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
ff11d735fb Added a comment: Snow Leopard 2013-01-18 17:57:40 +00:00
http://joeyh.name/
e1d44f8f6c Added a comment 2013-01-18 17:25:36 +00:00
Joey Hess
a235e22ca7 Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-18 13:18:24 -04:00
Joey Hess
f86462b475 allow lazy reading of map contents
Don't explicitly close; hGetContents will close when read is done.
2013-01-18 13:16:16 -04:00
Joey Hess
09e6ddc6ff done 2013-01-18 13:00:42 -04:00
Joey Hess
e481ca7658 some more direct mode fixes
Avoid a crash if a mapping contains files that no longer exist.
This could happen because eg, one was deleted and a commit has not yet been
done to update the mapping.

Fix path calculation.
2013-01-18 12:39:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkvSZ1AFJdY_1FeutZr_KWeqtzjZta1PNE
6e0bc560ca Added a comment 2013-01-18 16:30:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkvSZ1AFJdY_1FeutZr_KWeqtzjZta1PNE
6e70f78298 poll vote (Google Drive) 2013-01-18 16:27:34 +00:00
Joey Hess
5c58e9c101 Avoid filename encoding errors when writing direct mode mappings. 2013-01-18 12:26:45 -04:00
Joey Hess
bbf0e74f72 Fix direct mode mapping code to always store direct mode filenames relative to the top of the repository, even when operating inside a subdirectory. 2013-01-18 12:20:08 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnaYy6kTuKAHmsa4BtGls2oqa42Jo2w2v0
e9be487dcc Added a comment: Snow Leopard 2013-01-18 15:51:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn3m4J087saKH761otsxmTtQdme8mWL0Uc
299aeca177 2013-01-18 10:46:35 +00:00
http://peter-simons.myopenid.com/
297104088f 2013-01-18 10:13:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnjjCyhVEcTRM5m4iIBqL3ZCooPx7ZYB_E
465eba4e48 Added a comment 2013-01-18 09:08:05 +00:00
46.223.62.193
1f3f575be9 poll vote (My phone (or MP3 player)) 2013-01-18 08:39:48 +00:00
128.54.45.230
acf0a38919 poll vote (Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release.) 2013-01-18 05:52:39 +00:00
Joey Hess
912de36ecc Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-17 21:20:12 -04:00
Joey Hess
07a8c87af4 blog for the day 2013-01-17 21:19:34 -04:00
Joey Hess
49f4ba297c sync: Automatic merge conflict resolution now stages deleted files. 2013-01-17 21:19:00 -04:00
Joey Hess
a75946fc6f Depend on git 1.7.7.6 for --no-edit. Closes: #698399 2013-01-17 21:00:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
289e23f993 2013-01-18 00:20:04 +00:00
http://joeyh.name/
057311533f Added a comment 2013-01-17 20:59:03 +00:00
Joey Hess
e15e987ce1 mediafire 2013-01-17 16:36:15 -04:00
Joey Hess
a1b28e476a Regression test for union merge bug
Fixed in 0214e0fb17
2013-01-17 16:28:35 -04:00
http://joeyh.name/
73271dd931 Added a comment 2013-01-17 18:30:06 +00:00
http://joeyh.name/
689883a0b3 Added a comment 2013-01-17 18:23:27 +00:00
http://joeyh.name/
48eca0a80f Added a comment 2013-01-17 18:22:27 +00:00
Joey Hess
7272179979 avoid running pre-commit hook in direct mode
The code that handles committing unlocked files in indirect mode did
something unexpected and data lossy.
2013-01-17 14:11:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
9cee5b43c2 Added a comment: MediaFire REST API 2013-01-17 16:53:41 +00:00
http://joeyh.name/
19ddb71da3 Added a comment 2013-01-17 16:44:26 +00:00
http://joeyh.name/
a89d11a34c Added a comment 2013-01-17 16:29:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
cd73cd29f0 Added a comment: MediaFire 2013-01-17 12:17:54 +00:00
http://christian.amsuess.com/chrysn
f1e30f7104 Added a comment 2013-01-17 12:04:34 +00:00
http://christian.amsuess.com/chrysn
b1cb40ee95 poll vote (I need to be able to restrict in which repo dirs changes get auto-committed) 2013-01-17 11:57:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
66a02a3c9e Added a comment 2013-01-17 08:30:55 +00:00
128.61.104.52
be2736f6e2 poll vote (I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try git remote add, since there is no clear method to completely forget a git-annex remote...) 2013-01-17 04:00:21 +00:00
http://a-or-b.myopenid.com/
67f275dba4 Added a comment 2013-01-17 02:13:03 +00:00
http://a-or-b.myopenid.com/
866e8fd345 2013-01-17 02:11:45 +00:00
http://a-or-b.myopenid.com/
4821b67a61 Added a comment 2013-01-17 01:57:06 +00:00
Joey Hess
8aeeedcc4e fixed 2013-01-16 21:46:49 -04:00
http://joeyh.name/
78e7a1b054 Added a comment 2013-01-17 01:45:59 +00:00
Joey Hess
1acff2b68f Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-16 21:45:41 -04:00
Joey Hess
52e6eeaf06 drop: fix misleading message 2013-01-16 21:44:42 -04:00
http://joeyh.name/
cd73c2fc31 Added a comment 2013-01-17 01:35:45 +00:00
Joey Hess
e68e65f5a3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-16 21:33:08 -04:00
Joey Hess
0214e0fb17 union merge bugfix
Union merges involving two or more repositories could sometimes result in
data from one repository getting lost. This could result in the location
log data becoming wrong, and fsck being needed to fix it.

NB: I audited for any other occurrences of this problem. There are other
places than union merge where multiple changes are fed into update-index
in a stream, but they all involve working copy files being staged, or their
deletion being staged, and in this case it's fine for the later changes
to override the earlier ones.
2013-01-16 21:31:06 -04:00
http://joeyh.name/
2c47bab630 Added a comment 2013-01-17 00:46:28 +00:00
http://a-or-b.myopenid.com/
1f6363aa8d 2013-01-16 23:58:24 +00:00
Joey Hess
65d9ced549 tweaks 2013-01-16 19:52:41 -04:00
http://joeyh.name/
6d59cb8f88 Added a comment 2013-01-16 23:05:13 +00:00