Joey Hess
4c22c2261f
minor optimisation and warning fix
2013-05-20 13:58:41 -04:00
Joey Hess
94ab82bad8
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-20 13:47:05 -04:00
http://joeyh.name/
865eac2dc3
Added a comment
2013-05-20 17:46:09 +00:00
Joey Hess
f4ba19f2b8
direct mode bug fix: After a conflicted merge was automatically resolved, the content of a file that was already present could incorrectly be replaced with a symlink.
...
The bug was in movein, which just replaceFile'd the file with a symlink,
even if it already had the desired content, before trying to pull the
content out of the annex and replace the symlink with it.
That was ok-ish for non conflicted merges, where if the file existed it would
be an old version of the content. But for conflicted merges, the automatic
merge resolver has already run, and will have already put the desired
content into the file for the local variant.
Also, made removeDirect not trust that the associated files map is correct.
Only if it can verify that another file has the content will it not move it
into .git/annex/objects.
2013-05-20 13:41:09 -04:00
http://joeyh.name/
e9794fb6ca
Added a comment
2013-05-20 16:22:18 +00:00
http://joeyh.name/
3090327bc0
Added a comment
2013-05-20 16:09:47 +00:00
http://edheil.wordpress.com/
ff8026f4f9
Added a comment
2013-05-20 16:08:14 +00:00
http://joeyh.name/
0866364a0b
Added a comment
2013-05-20 16:06:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
ddd99d3296
Added a comment
2013-05-20 15:53:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
dc0d466570
Added a comment
2013-05-20 15:52:40 +00:00
Joey Hess
3bac3b5b51
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-20 11:40:13 -04:00
213.138.67.85
c6f55c3a80
poll vote (/sdcard/annex)
2013-05-20 15:00:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
8af25edc8c
Added a comment
2013-05-20 14:37:37 +00:00
http://edheil.wordpress.com/
c564e66e58
Added a comment
2013-05-20 13:57:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
29f30aa3b9
2013-05-20 12:40:55 +00:00
Joey Hess
9fa063a00f
debian architecture build fun
2013-05-19 21:44:33 -04:00
Joey Hess
e89c5b467f
avoid failing build if cabal failed to update
2013-05-19 21:12:46 -04:00
Joey Hess
19715b9cff
fix windows build
2013-05-19 21:07:47 -04:00
Joey Hess
920c81ca14
stupid windows..
2013-05-19 21:02:50 -04:00
Joey Hess
5b09b8d6bf
seems windows sh doesn't properly handle set -e in functions
2013-05-19 20:45:54 -04:00
Joey Hess
5fbe3bc756
hmm
2013-05-19 20:41:44 -04:00
Joey Hess
ab4925d4aa
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-19 20:36:23 -04:00
Joey Hess
0bc43407e5
do a clean build if incremental fails
2013-05-19 20:35:33 -04:00
http://joeyh.name/
455091fa7a
add nntp remote page
2013-05-20 00:12:53 +00:00
Joey Hess
b5433c3a9d
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-19 18:26:15 -04:00
Joey Hess
2f8bfaea4e
blog for the day
2013-05-19 18:20:48 -04:00
Joey Hess
796c2f6bc8
remove unnecessary bracketIO
2013-05-19 18:15:29 -04:00
http://joeyh.name/
4186a6f40c
Added a comment
2013-05-19 22:03:57 +00:00
Joey Hess
66fe5beac2
update
2013-05-19 18:03:38 -04:00
Joey Hess
d5ba9cb728
Allow building with gpg2.
2013-05-19 17:59:58 -04:00
Joey Hess
8688f08804
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-19 17:59:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
97ca0eb516
removed
2013-05-19 21:57:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
77d01941a4
Add note about no webapp in Raring
2013-05-19 21:57:27 +00:00
Joey Hess
29d8cc8b76
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-19 17:57:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
1061eed106
Added a comment: Official Raring build also does not have the Assistant enabled
2013-05-19 21:52:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
0f4af3cbe7
Added a comment
2013-05-19 21:35:37 +00:00
Joey Hess
c552336621
idea
2013-05-19 17:29:20 -04:00
http://me.tinco.nl/
05dad9325d
Added a comment
2013-05-19 21:24:48 +00:00
Joey Hess
7b2bb513a0
moreinfo
2013-05-19 17:24:13 -04:00
http://joeyh.name/
cf9c7f3153
Added a comment
2013-05-19 21:13:41 +00:00
http://joeyh.name/
7a2fba971b
Added a comment
2013-05-19 21:09:54 +00:00
Joey Hess
db6ff0f688
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-19 16:58:57 -04:00
Joey Hess
3f2739086e
close; was wrong password
2013-05-19 16:57:47 -04:00
http://joeyh.name/
f1d241a465
Added a comment
2013-05-19 20:56:25 +00:00
http://joeyh.name/
40a0f4c6e4
removed
2013-05-19 20:50:52 +00:00
http://joeyh.name/
20f5790cf3
Added a comment
2013-05-19 20:49:06 +00:00
http://me.tinco.nl/
3fb592fe7e
Added a comment
2013-05-19 20:45:53 +00:00
Joey Hess
02a92f8066
move todo item that wasn't to the forum, with a better title
2013-05-19 16:45:08 -04:00
http://joeyh.name/
471927b767
Added a comment
2013-05-19 20:43:44 +00:00
http://joeyh.name/
bc46148517
Added a comment
2013-05-19 20:29:25 +00:00
