mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
19042 commits 13 branches 445 tags 110 MiB
Commit graph

4529 commits

Author SHA1 Message Date
Joey Hess
7ee9657000 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-27 14:32:05 -04:00
Joey Hess
3b8d5f03bb Fix glacier repo creation bug 
Version 5.20140227 broke creation of glacier repositories, not including
the datacenter and vault in their configuration. This bug is fixed, but
glacier repositories set up with the broken version of git-annex need to
have the datacenter and vault set in order to be usable. This can be done
using git annex enableremote to add the missing settings. For details, see
http://git-annex.branchable.com/bugs/problems_with_glacier/
 2014-03-27 14:30:36 -04:00
http://joeyh.name/
2afbc2bfd8 Added a comment 2014-03-27 17:40:51 +00:00
Joey Hess
84a686f4a3 re-close. the bug was fixed. 2014-03-27 13:38:20 -04:00
http://joeyh.name/
ac07230364 Added a comment 2014-03-27 17:27:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmdbVIGiDH8KarAGAy8y2FHJD_F990JzXI
32d643554b 2014-03-27 15:11:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmdbVIGiDH8KarAGAy8y2FHJD_F990JzXI
4a84cd70b6 2014-03-27 15:06:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
f62c68b9e9 Added a comment 2014-03-27 14:46:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
6153d80c22 2014-03-27 14:33:10 +00:00
http://johan.kiviniemi.name/
cbe5456401 2014-03-27 01:21:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
a124291a40 Added a comment 2014-03-26 22:39:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d2e11a6991 2014-03-26 22:27:02 +00:00
Joey Hess
1dab5679d4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-26 16:57:01 -04:00
Joey Hess
dcf4136340
improve metadata documentation 2014-03-26 16:55:29 -04:00
http://joeyh.name/
11eb39779a Added a comment 2014-03-26 20:55:24 +00:00
Joey Hess
372adab812 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-26 16:54:32 -04:00
http://joeyh.name/
b0a72ae4cc Added a comment 2014-03-26 20:50:57 +00:00
Joey Hess
5c79fa0351
avoid generating arbitrary MetaData with illegal fields 2014-03-26 16:40:52 -04:00
cehteh
936cbcfeb7 2014-03-26 19:45:41 +00:00
Joey Hess
87137a6e71
close 2014-03-26 15:01:29 -04:00
Joey Hess
2f538dd65c add --include-dotfiles: New option, perhaps useful for backups. 2014-03-26 14:52:07 -04:00
http://joeyh.name/
236bc9e4fc Added a comment 2014-03-26 17:36:00 +00:00
Joey Hess
cb7574ce10 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-26 13:28:46 -04:00
Joey Hess
0df4848a9e forget --drop-dead: Avoid removing the dead remote from the trust.log, so that if git remotes for it still exist anywhere, git annex info will still know it's dead and not show it. 2014-03-26 13:28:26 -04:00
http://joeyh.name/
363a638b80 Added a comment 2014-03-26 17:19:58 +00:00
Joey Hess
2940fa1ba2 respond; improve docs 2014-03-26 13:11:49 -04:00
Joey Hess
27d27b4da2 tahoe: Pass -d parameter before subcommand; putting it after the subcommand no longer works with tahoe-lafs version 1.10. (Thanks, Alberto Berti) 2014-03-26 12:59:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
db91f38f8f 2014-03-26 12:30:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
dad57b67c4 2014-03-26 11:55:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmcAgG_9p0pFOM4TOWwm3nGCDIiCZi4oMw
78272de2df added patch 2014-03-26 00:35:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
831e9f81d0 Added a comment 2014-03-24 07:03:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
eaea14da17 2014-03-24 07:00:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawndST_f5oYifnfwYRwYr1iHynVd5H5MjJM
f5b3ab5ef0 2014-03-24 00:21:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnvVfFLW4CTKs7UjdiLIsOn_cxj1Jnh64I
9d3b9cc5d1 Added a comment: Could it be gmail.com XMPP throttling? 2014-03-23 19:26:09 +00:00
http://born.myopenid.com/
ff0202d87a 2014-03-22 18:15:47 +00:00
onno
7414e5d04c 2014-03-21 19:24:14 +00:00
http://schnouki.net/
a7382d7515 Added a comment 2014-03-20 23:54:51 +00:00
Joey Hess
fac8198a2f fix up old comments that used format=txt, which is no longer enabled 2014-03-20 12:09:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
97eded4ea8 Added a comment: Your changes to git annex worked 2014-03-19 21:27:40 +00:00
Joey Hess
3d48de183d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-19 16:55:52 -04:00
Joey Hess
e197eb6672 moreinfo 2014-03-19 16:55:13 -04:00
http://joeyh.name/
273240451a Added a comment: ping? 2014-03-19 20:54:57 +00:00
http://joeyh.name/
155337ac74 Added a comment 2014-03-19 20:52:08 +00:00
http://joeyh.name/
2f1d1f45f2 Added a comment: moreinfo 2014-03-19 20:49:51 +00:00
Joey Hess
87b22aaee9 retitle 2014-03-19 16:40:56 -04:00
Joey Hess
5dddb27c58 close 2014-03-19 16:39:31 -04:00
Joey Hess
0ba316d30f moreinfo 2014-03-19 16:31:19 -04:00
http://joeyh.name/
4862f51f74 Added a comment: ping? 2014-03-19 20:29:17 +00:00
Joey Hess
3ab7af990e fix moreinfo tag 2014-03-19 16:27:15 -04:00
Joey Hess
71f5042a1d moreinfo 2014-03-19 16:24:35 -04:00
http://joeyh.name/
79caa2a070 Added a comment: ping? 2014-03-19 20:24:27 +00:00
Joey Hess
40537e5c5c close 2014-03-19 16:23:58 -04:00
Joey Hess
84ccb8c81c
close 2014-03-19 16:22:55 -04:00
Joey Hess
1f71f157ec
fix link 2014-03-19 16:22:05 -04:00
Joey Hess
624190618f Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-19 16:13:14 -04:00
Joey Hess
1052eeface Windows: Fix some filename encoding bugs. 
http://git-annex.branchable.com/bugs/Unicode_file_names_ignored_on_Windows/

Not a complete fix yet.
 2014-03-19 15:57:56 -04:00
http://joeyh.name/
1932feafe5 Added a comment 2014-03-19 19:57:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk5aY0oBmuQtnoTNtji-dPgDw9p7J24YeY
e5b0ba4d0b Added a comment: further info 3 2014-03-19 16:24:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk5aY0oBmuQtnoTNtji-dPgDw9p7J24YeY
a380b26d09 Added a comment: further info 2 2014-03-19 11:53:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk5aY0oBmuQtnoTNtji-dPgDw9p7J24YeY
dcf93d0fb8 Added a comment: further info 2014-03-18 23:46:08 +00:00
Joey Hess
fa641dad2d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-18 16:15:46 -04:00
http://joeyh.name/
b7da728dab Added a comment 2014-03-18 19:07:25 +00:00
http://joeyh.name/
881acf6562 Added a comment 2014-03-18 18:42:57 +00:00
http://joeyh.name/
f9972b1864 Added a comment 2014-03-18 18:14:57 +00:00
http://joeyh.name/
cfe5cf559f Added a comment 2014-03-18 18:09:08 +00:00
http://joeyh.name/
59991767cf Added a comment: analysis 2014-03-18 17:54:09 +00:00
Joey Hess
40b599eff2 rsync special remote: Fix slashes when used on Windows. 2014-03-18 13:02:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk5aY0oBmuQtnoTNtji-dPgDw9p7J24YeY
ed36fee7a0 2014-03-18 13:30:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnDXvDvWTXmCqQ90ATTD4dV3Ii4YbnE8E0
163708a308 This reverts commit 424956520e 2014-03-18 03:55:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnDXvDvWTXmCqQ90ATTD4dV3Ii4YbnE8E0
efaaa2138c removed 2014-03-18 03:54:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
62b8876f5d Added a comment: Maybe the autobuild is broken? 2014-03-17 20:32:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY
424956520e Added a comment 2014-03-17 20:12:31 +00:00
Joey Hess
852fa00661 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-17 15:44:50 -04:00
Joey Hess
fb9ddfa231 map: Fix crash when one of the remotes of a repo is a local directory that does not exist, or is not a git repo. 2014-03-17 15:44:42 -04:00
http://joeyh.name/
9adb3fdf62 removed 2014-03-17 19:32:48 +00:00
http://joeyh.name/
27039a8c3b Added a comment 2014-03-17 19:30:38 +00:00
http://joeyh.name/
b0ea8af11a Added a comment 2014-03-17 19:28:47 +00:00
http://joeyh.name/
ee2fdbb594 Added a comment 2014-03-17 19:28:05 +00:00
Joey Hess
6a36af25b0 close 2014-03-17 15:26:41 -04:00
Joey Hess
b4d12855d6
close 2014-03-17 15:26:18 -04:00
Joey Hess
1d5210fd87 remove duplicate posts all about the same issue 
If iat first it doesn't work, spam spam spam spam
 2014-03-17 14:30:45 -04:00
Joey Hess
921acdf190 close 2014-03-17 14:27:34 -04:00
Joey Hess
a9d03533d1 rename 2014-03-17 14:06:35 -04:00
pablo
6a0dd55708 2014-03-17 17:57:21 +00:00
pablo
cef0983922 2014-03-17 17:52:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk4vUNAWlaoXMpCw0pYcEv48mnXVYtOlWE
17bcfb2cf8 rsync special remote on linux from a windows machines, impossible to get 2014-03-17 17:50:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk4vUNAWlaoXMpCw0pYcEv48mnXVYtOlWE
185e8195b4 2014-03-17 17:45:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk4vUNAWlaoXMpCw0pYcEv48mnXVYtOlWE
b5ddeda842 2014-03-17 17:43:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
be4727381d Added a comment: Problem still occurs but maybe my update did not work 2014-03-16 18:01:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY
a7b46c16f6 Added a comment 2014-03-16 04:52:20 +00:00
http://joeyh.name/
062d5b9641 Added a comment 2014-03-15 21:41:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY
3da78c0397 Added a comment 2014-03-15 16:17:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY
870c4e965b removed 2014-03-15 16:16:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY
3d8c206783 Added a comment 2014-03-15 16:15:47 +00:00
http://joeyh.name/
611d5ab3b2 Added a comment 2014-03-15 16:01:53 +00:00
http://joeyh.name/
a6ac4dcde2 Added a comment 2014-03-15 15:53:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkBEmz5XoJVzN0u-0nOtpn7BBBDHsiLmxY
91d2ae5207 initial edit 2014-03-15 14:24:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
48e0f18ebe 2014-03-14 21:19:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
c907b6679c 2014-03-14 21:12:21 +00:00
Joey Hess
b7b9afa9ad Better workaround for problem umasks when eg, setting up ssh keys. 2014-03-14 13:37:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmOdGR-S4e3-3A9o6JQdZW1mfILaUNUzwA
4a4f5ffe71 2014-03-14 14:47:03 +00:00
Joey Hess
005e8744c1 Commands that allow specifying which repository to act on using the repository's description will now fail when multiple repositories match, rather than picking a repository at random. 
So will --in=

Note that since limitIn is not used by preferred content expressions,
it's ok for it to throw an exception.
 2014-03-13 15:36:58 -04:00
Joey Hess
935d3f562d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-13 14:53:34 -04:00
Joey Hess
4cc34973d9 copy --fast --to remote: Avoid printing anything for files that are already believed to be present on the remote. 2014-03-13 14:51:22 -04:00
http://joeyh.name/
0a247f43df Added a comment 2014-03-13 15:54:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY
7b82a82b94 Added a comment 2014-03-13 14:36:20 +00:00
http://joeyh.name/
60ad64fc92 Added a comment 2014-03-12 19:45:24 +00:00
Joey Hess
bd6355e5e2
move forum post to bug report (and close it) 2014-03-12 15:33:27 -04:00
Joey Hess
67f09bca6d fully fix fsck memory use by iterative fscking 
Not very well tested, but I'm sure it doesn't eg, loop forever.
 2014-03-12 15:18:43 -04:00
Joey Hess
3f23935a76 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-12 13:26:40 -04:00
Joey Hess
97ba49a5e1 close !!! 2014-03-12 13:01:45 -04:00
http://joeyh.name/
d2382f8800 Added a comment 2014-03-12 17:01:13 +00:00
http://smcv.pseudorandom.co.uk/
ad336488e7 Added a comment 2014-03-12 07:54:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkLdR1fuu5aEz3s9VKTBKVMize_SmeNRJM
ab2e432588 Added a comment: Seems to be working now 2014-03-12 02:37:00 +00:00
http://joeyh.name/
a28269773d Added a comment 2014-03-11 03:02:22 +00:00
Joey Hess
b95ca44bd1 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-10 17:22:00 -04:00
http://joeyh.name/
da9b9c6d4a Added a comment 2014-03-10 21:20:10 +00:00
Joey Hess
ee24f80dd0 fixed 2014-03-10 17:01:08 -04:00
napopa
0d983c4fb2 2014-03-10 20:16:41 +00:00
http://joeyh.name/
6edeacddb0 Added a comment 2014-03-10 19:24:45 +00:00
http://joeyh.name/
adbb07f91e Added a comment 2014-03-10 19:20:42 +00:00
http://joeyh.name/
b969bb5e2c Added a comment 2014-03-10 19:17:34 +00:00
http://joeyh.name/
021df438c4 Added a comment 2014-03-10 18:12:29 +00:00
Joey Hess
aab40f02ca
promote forum post to bug 2014-03-10 14:04:13 -04:00
http://joeyh.name/
7aad1bff54 Added a comment 2014-03-10 17:34:56 +00:00
http://joeyh.name/
f8eea14722 Added a comment 2014-03-10 17:11:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
ab8a8522d7 Added a comment 2014-03-10 14:14:07 +00:00
http://schnouki.net/
4b776832dd Added a comment 2014-03-09 16:29:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY
f40d9a837f Added a comment: Sync messed up 2014-03-09 12:16:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY
c87079efbc 2014-03-09 10:17:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY
6c5bcd6d95 2014-03-09 10:05:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawno-jcsScu4CK6k2QLZqxMros1PQHf1NQY
f62633fc89 2014-03-09 10:01:32 +00:00
Joey Hess
533bc8a83e
retitle 2014-03-07 13:48:10 -04:00
Joey Hess
a5fbd12d4e
fixed 2014-03-07 13:41:28 -04:00
Joey Hess
5072710719
moreinfo 2014-03-07 13:40:17 -04:00
Joey Hess
83bea9148a moreinfo 2014-03-07 13:38:53 -04:00
Joey Hess
e63a79ecd0
moreinfo 2014-03-07 13:37:06 -04:00
Joey Hess
a10b5b19ad enable haskell-dns library, rather than needing "host" command 
Done on Debian to keep the autobuilds and Debian packages the same,
but can be reverted for backports, since haskell-dns is not available
there.
 2014-03-07 13:33:24 -04:00
Joey Hess
febdf511f2 duplicate of older bug 2014-03-07 13:27:12 -04:00
Joey Hess
cc9798c7ad Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-07 13:25:32 -04:00
Joey Hess
b571e6d560 close 2014-03-07 13:25:09 -04:00
Joey Hess
71f4c00590 moreinfo 2014-03-07 13:23:53 -04:00
Joey Hess
0ea1a629c4 fixed 2014-03-07 13:22:34 -04:00
http://joeyh.name/
5d543c7395 Added a comment 2014-03-07 17:21:02 +00:00
Joey Hess
b618a049ba close 2014-03-07 13:19:53 -04:00
Joey Hess
d840fffe87 close 2014-03-07 13:18:20 -04:00
http://joeyh.name/
f1ff9798e7 Added a comment 2014-03-07 17:16:41 +00:00
Joey Hess
b08fd4cd19 tag moreinfo and fix title 2014-03-07 13:12:23 -04:00
Joey Hess
a3d9a7fe8b tag moreinfo 2014-03-07 13:10:19 -04:00
Joey Hess
caaba3ed7d rename 2014-03-07 13:09:52 -04:00
Joey Hess
24bfbb8514 close 2014-03-07 13:08:48 -04:00
Joey Hess
811f645b75 close 2014-03-07 13:07:42 -04:00
Joey Hess
d6d0f99b4c close 2014-03-07 13:07:01 -04:00
http://joeyh.name/
153a3fae8a Added a comment 2014-03-07 17:03:30 +00:00
Joey Hess
1f99a6778f Fix direct mode getKeysPresent false positive & also sped up direct mode unused and unannex 
unused: In direct mode, files that are deleted from the work tree are no longer incorrectly detected as unused.

Direct mode `git annex info` slows down a bit due to more stringent
checking, but not by a lot.
 2014-03-07 12:43:56 -04:00
http://schnouki.net/
fd82c48623 Added a comment 2014-03-07 08:52:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
fb7b46525d Added a comment 2014-03-06 21:38:54 +00:00
http://joeyh.name/
aeed1895ba Added a comment: analysis 2014-03-06 21:37:15 +00:00
Joey Hess
aa131c870a
move bug out of forum and close 2014-03-06 17:18:35 -04:00
http://grossmeier.net/
208ff86fe6 Added a comment 2014-03-06 18:54:08 +00:00
http://joeyh.name/
9efc14a164 Added a comment 2014-03-06 18:14:37 +00:00
http://joeyh.name/
b52c54ac36 Added a comment 2014-03-06 18:12:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
79cd749b7e Added a comment 2014-03-06 06:22:00 +00:00
http://schnouki.net/
4222f13419 Added a comment 2014-03-06 00:10:10 +00:00
Joey Hess
d32289bab0 assistant: Smarter log file rotation, which takes free disk space into account. 2014-03-05 18:26:53 -04:00
peterll
b09f0c9766 2014-03-05 22:03:30 +00:00
http://joeyh.name/
c6d8e00f73 Added a comment 2014-03-05 21:08:34 +00:00
http://joeyh.name/
6ed5334924 Added a comment: strace or it didn't happen 2014-03-05 21:02:17 +00:00
Joey Hess
7dab73db84 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-05 17:00:33 -04:00
Joey Hess
1d78a7b319
retitle bug to something less attractive to entirely unrelated problems 2014-03-05 16:55:03 -04:00
http://joeyh.name/
92a619e144 Added a comment 2014-03-05 20:49:20 +00:00
Joey Hess
96fc3c7edf Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-05 15:25:50 -04:00
Joey Hess
b793c77f85 done 2014-03-05 14:37:57 -04:00
http://joeyh.name/
d95c075ae4 Added a comment 2014-03-05 18:02:08 +00:00
Joey Hess
aa377ed567 webdav: When built with a new enough haskell DAV (0.6), disable the http response timeout, which was only 5 seconds. 2014-03-05 13:51:54 -04:00
http://joeyh.name/
7bdebd3747 Added a comment 2014-03-05 17:11:40 +00:00
Joey Hess
f2ec50ae0f dup 2014-03-05 13:10:37 -04:00
http://joeyh.name/
6fd1a351fd Added a comment 2014-03-05 17:08:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
424b1dcc82 Added a comment 2014-03-05 17:07:05 +00:00
Joey Hess
f6df004daa moreinfo 2014-03-05 13:05:49 -04:00
http://joeyh.name/
8c22a6166e Added a comment 2014-03-05 16:56:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
e8e0b4ee49 Added a comment 2014-03-05 11:47:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e0ce771aa5 Added a comment 2014-03-05 08:10:26 +00:00
http://grossmeier.net/
775229a2f4 Added a comment 2014-03-05 04:38:26 +00:00
http://grossmeier.net/
07dcd0eb4b Added a comment 2014-03-05 04:34:54 +00:00
Joey Hess
3fb291f482 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 23:24:16 -04:00
Joey Hess
1f98d6fb00 glacier: Pass --region to glacier checkpresent. 
I suppose this is not necessary when it has a local cache, so I didn't
notice it was missing.
 2014-03-04 23:22:24 -04:00
http://joeyh.name/
5dcc8555d2 Added a comment 2014-03-05 03:15:44 +00:00
http://joeyh.name/
43ae02e572 Added a comment 2014-03-05 03:14:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA
1aaa7a44cc 2014-03-05 01:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
38a216abb2 Added a comment 2014-03-04 11:01:13 +00:00
Joey Hess
1fbf5f608d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 02:11:20 -04:00
Joey Hess
4a847cdc08 finish fixing direct mode merge bug involving unstaged local files 
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.

Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.

Still need to run test suite on windows.
 2014-03-04 02:03:15 -04:00
http://joeyh.name/
d6c69b8d66 Added a comment 2014-03-03 21:58:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
bf981aa1d0 2014-03-03 20:34:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
28c97d3104 2014-03-03 20:27:58 +00:00
Joey Hess
eef1b7a3cc fixed initial reported problem but not out of the woods yet in some related cases 2014-03-03 15:00:54 -04:00
http://joeyh.name/
c8e4c76302 2014-03-03 18:12:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
502743b801 Added a comment 2014-03-03 14:05:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
db47b041f1 Added a comment 2014-03-03 14:01:11 +00:00