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

2394 commits

Author SHA1 Message Date
Joey Hess
f0d1af74e7 Merge branch 'automerge' 2012-06-27 16:12:28 -04:00
Joey Hess
855eca0cc6 close 2012-06-27 13:38:21 -04:00
Joey Hess
048b64024a sync: Automatically resolves merge conflicts. 
untested, but it compiles :)
 2012-06-27 13:08:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg
46c39888df Added a comment 2012-06-27 12:56:37 +00:00
http://joeyh.name/
48c0fd4bed Added a comment 2012-06-27 12:36:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
38571d8133 Added a comment 2012-06-27 08:54:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
b356015cf4 2012-06-27 06:50:41 +00:00
http://joeyh.name/
f6f4b5dfaa Added a comment 2012-06-27 03:08:13 +00:00
http://joeyh.name/
5faaf59368 Added a comment 2012-06-27 02:48:31 +00:00
Joey Hess
3ede3a8097 Merge branch 'master' into assistant 2012-06-26 22:31:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg
06aeff9c7d 2012-06-27 00:33:04 +00:00
Joey Hess
1eff74dd44 blog for the day 2012-06-26 19:25:46 -04:00
Joey Hess
e0a65247ae Merge branch 'master' into assistant 2012-06-26 17:23:20 -04:00
Joey Hess
7e62e57f8c Avoid ugly failure mode when moving content from a local repository that is not available. 
Prelude.undefined error message was introduced by
bb4f31a0ee.

It seems best to filter out local repositories that cannot be accessed
from the list of remotes, rather than keeping them in and making every
thing that uses the list have to deal with remotes that may have an unknown
location.

Besides fixing the error message, this also makes unavailable local
remotes' names not be shown in various messages, including in git annex
status output.

Also, move --to an unavailable local repository now avoids some ugly
errors like "changeWorkingDirectory: does not exist".
 2012-06-26 17:22:44 -04:00
Joey Hess
a7b8c807d9 new bug I noticed 2012-06-26 12:37:04 -04:00
Joey Hess
75e8690cca Merge branch 'master' into assistant 
Conflicts:
	GitAnnex.hs
 2012-06-26 09:16:08 -04:00
Joey Hess
41fcb3d852 Version build dependency on STM, and allow building without it, which disables the watch command. 2012-06-26 09:15:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
6168795c1a 2012-06-26 08:32:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
f72dd3e7e5 2012-06-26 08:31:48 +00:00
Joey Hess
336cee671e blog for the day 2012-06-25 20:40:58 -04:00
Joey Hess
17a8f60710 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-25 20:17:54 -04:00
Joey Hess
05c4dfb941 fixup merges now done when needed 2012-06-25 20:16:30 -04:00
Joey Hess
14015036bc Merge branch 'master' into assistant 2012-06-25 16:44:37 -04:00
Joey Hess
5cfe91f06d add a push retry thread 2012-06-25 16:38:12 -04:00
http://joeyh.name/
e3163bf416 Added a comment 2012-06-25 15:45:18 +00:00
http://joeyh.name/
61091915f6 Added a comment 2012-06-25 15:42:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7e8a6e76b1 2012-06-25 15:38:57 +00:00
http://joeyh.name/
07c15d9a17 Added a comment 2012-06-25 15:38:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0b04ff6431 2012-06-25 15:32:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
2e92f95edc 2012-06-25 15:30:00 +00:00
http://joeyh.name/
4884f18922 Added a comment 2012-06-25 15:29:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
fb415526e9 2012-06-25 13:37:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
fa5c88b8f1 Added a comment: For the moment 2012-06-25 02:51:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
7c754c8f66 Added a comment: Installation not working on OS X 10.6.8 2012-06-25 02:21:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I
4f04745c6b Added a comment: The fact that the keys changed causes merge conflicts 2012-06-25 00:29:02 +00:00
Joey Hess
38b3d8da1b typo 2012-06-24 17:51:08 -04:00
Joey Hess
fbc16360d5 add news item for git-annex 3.20120624 2012-06-24 12:51:36 -04:00
http://joeyh.name/
d233537451 Added a comment 2012-06-23 14:30:22 +00:00
Joey Hess
d88ee75a2d Merge branch 'master' into assistant 2012-06-23 10:27:12 -04:00
Joey Hess
325053e8de fixed 2012-06-23 10:27:04 -04:00
Joey Hess
af5e6156ba Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-23 10:23:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c6daf4e6c2 2012-06-23 07:24:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
f0617ece7c 2012-06-23 07:02:16 +00:00
Joey Hess
3118eeb63f update 2012-06-23 01:19:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlc1og3PqIGudOMkFNrCCNg66vB7s-jLpc
3606e94336 Added a comment: how is this different than rsync? 2012-06-22 22:10:22 +00:00
Joey Hess
264dd38c65 blog for the day 2012-06-22 17:17:41 -04:00
Joey Hess
153942cc6e update 2012-06-22 15:47:02 -04:00
Joey Hess
3ee44cf8fe add assistant command 
like watch, but more magic
 2012-06-22 13:04:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawldKnauegZulM7X6JoHJs7Gd5PnDjcgx-E
cf9bf920e8 Added a comment: Homebrew instead of MacPorts 2012-06-22 04:26:06 +00:00
Joey Hess
f27da7a1cc blog for the day and design update 2012-06-21 20:02:00 -04:00
Joey Hess
3138a49084 update 2012-06-21 13:11:22 -04:00
Joey Hess
46d1f5a9d0 fix test suite build 2012-06-21 13:04:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
ebe8ee6753 Added a comment 2012-06-21 07:08:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
680b0c8405 2012-06-21 06:36:02 +00:00
Joey Hess
9f1a29762b blog for the day 2012-06-21 01:07:37 -04:00
Joey Hess
c70c036707 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-20 19:33:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmL8pteP2jbYJUn1M3CbeLDvz2SWAA1wtg
a27f3af51f Added a comment 2012-06-20 20:49:07 +00:00
Joey Hess
4afefb48f1 thought 2012-06-20 15:29:12 -04:00
http://joeyh.name/
6d641f1ac0 Added a comment 2012-06-20 16:59:53 +00:00
Joey Hess
9dc512a3ca fixed 2012-06-20 12:58:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
77bcc76e87 Added a comment 2012-06-20 14:55:33 +00:00
http://joeyh.name/
568f8d0273 Added a comment 2012-06-20 14:49:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
e711f20c8f Added a comment 2012-06-20 14:37:10 +00:00
http://joeyh.name/
5774f14958 Added a comment 2012-06-20 14:34:23 +00:00
http://joeyh.name/
5976271390 Added a comment 2012-06-20 14:30:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
befa378ef7 2012-06-20 11:12:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXgp-iIaBK5pnk22xqMVERQb97VyXaejs
8dbd36ab0a 2012-06-20 11:12:11 +00:00
Joey Hess
dbe7d0e7fe Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-19 18:35:07 -04:00
Joey Hess
2a079a9d37 blog for the day 2012-06-19 18:32:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c838a35d83 2012-06-19 22:28:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
23b08efa42 2012-06-19 22:28:08 +00:00
Joey Hess
8bdb331b60 bug 2012-06-19 10:17:06 -04:00
Joey Hess
39746e30dc typo 2012-06-19 10:11:28 -04:00
Joey Hess
d832a474e9 fixed 2012-06-19 09:19:40 -04:00
Joey Hess
27b5fc9fd4 yeah 2012-06-19 09:11:04 -04:00
Joey Hess
c8d4efeed3 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-19 09:09:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
99a3d6a00c 2012-06-19 07:09:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncBlzaDI248OZGjKQMXrLVQIx4XrZrzFo
e986d1acb1 2012-06-19 07:08:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
d4e5affec0 2012-06-19 07:08:34 +00:00
Joey Hess
424e58d960 update 2012-06-19 02:16:31 -04:00
http://www.davidhaslem.com/
9232bc860f Added a comment 2012-06-19 04:41:28 +00:00
Joey Hess
f684f282f2 blog for the day 2012-06-18 18:21:03 -04:00
Joey Hess
0ecc7dc892 close 2012-06-18 10:09:56 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
762b67c163 2012-06-18 08:39:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
123df55d61 2012-06-18 08:24:24 +00:00
Joey Hess
123766963e Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-17 17:24:46 -04:00
Joey Hess
9afdf7c954 blog for the day 2012-06-17 17:24:07 -04:00
Joey Hess
91567ab8f6 make inotify a build flag etc 2012-06-17 17:15:56 -04:00
Joey Hess
bf3339e5b7 Merge branch 'master' into watch 2012-06-17 15:45:35 -04:00
http://joeyh.name/
1a6f7ae00b Added a comment 2012-06-17 16:39:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
bdf66c589a Added a comment 2012-06-17 08:52:33 +00:00
Joey Hess
ec197feec0 update 2012-06-17 02:08:28 -04:00
Joey Hess
31c15aa9b9 update 2012-06-17 01:34:10 -04:00
Joey Hess
88c0951b57 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-17 01:28:21 -04:00
Joey Hess
da261b31de surveyed the OSX and BSD options for file monitoring 2012-06-17 01:28:09 -04:00
Joey Hess
9356f11c60 surveyed the OSX and BSD options for file monitoring 2012-06-17 01:25:48 -04:00
http://dieter-be.myopenid.com/
2a9c5ebfaa Added a comment 2012-06-16 09:14:27 +00:00
Joey Hess
7d6329e5e4 check lsof at runtime 2012-06-16 02:49:26 -04:00
Joey Hess
0052cec2b7 add lsof build deps 
Check for it in configure; and add a --force option for people without it
who want to live dangerously.
 2012-06-15 23:29:39 -04:00
http://joeyh.name/
eaf4cbec54 Added a comment 2012-06-16 03:26:37 +00:00