Commit graph

25746 commits

Author SHA1 Message Date
anarcat
1d2ba784ce Added a comment: amazing 2015-10-17 02:17:13 +00:00
PaulK
0279b0235e Added a comment 2015-10-16 01:32:38 +00:00
Joey Hess
169991a6ae
devblog 2015-10-15 16:50:10 -04:00
Joey Hess
7ff46b44d6
upstream patch needs testing 2015-10-15 16:42:54 -04:00
Joey Hess
26b8f8a9b6
followup 2015-10-15 16:03:57 -04:00
Joey Hess
d7c29f169c
close as encfs is the bug 2015-10-15 15:44:11 -04:00
Joey Hess
c45e380bf0
fixed 2015-10-15 15:41:26 -04:00
Joey Hess
806819be57
Avoid displaying network transport warning when a ssh remote does not yet have an annex.uuid set.
Instead, only display transport error if the configlist output doesn't
include an annex.uuid line, even an empty one.

A recent change made git-annex init try to get all the remote uuids, and so
the transport error would be displayed by it. It was also displayed when
eg, copying files to a remote that had no uuid yet.
2015-10-15 15:36:54 -04:00
Joey Hess
8c54069980
add a hint about syncing when unable to determine remote uuid
syncing gets the uuid in passing..
2015-10-15 15:23:48 -04:00
Joey Hess
1f65de4085
improve layout and comment 2015-10-15 15:10:14 -04:00
Joey Hess
50949b11ab
response 2015-10-15 14:51:08 -04:00
Joey Hess
6d16e1615e
response 2015-10-15 14:45:48 -04:00
Joey Hess
3879f6e6be
do tmp dir cleanup in error case too 2015-10-15 14:27:14 -04:00
Joey Hess
1b023493ef
close 2015-10-15 14:27:03 -04:00
Joey Hess
27eaa6f410
avoid making post-merge-conflict-resolution commit when no conflicts were resolved
sync, merge, assistant: When git merge failed for a reason other than a
conflicted merge, such as a crippled filesystem not allowing particular
characters in filenames, git-annex would make a merge commit that could
omit such files or otherwise be bad. Fixed by aborting the whole merge
process when git merge fails for any reason other than a merge conflict.
2015-10-15 14:22:46 -04:00
Joey Hess
238728362f
analysis 2015-10-15 14:13:39 -04:00
Joey Hess
1fda285c4a
comment 2015-10-15 13:14:57 -04:00
Joey Hess
62d5e7b811
Merge branch 'master' of ssh://git-annex.branchable.com 2015-10-15 11:42:55 -04:00
Joey Hess
c32a2429ed
S3: Fix support for using https.
Was using the http-only Manager before, not the tls-capable one.
2015-10-15 10:37:06 -04:00
Joey Hess
45c9440cf9
refactor 2015-10-15 10:34:19 -04:00
CandyAngel
19fdf55a0b Added a comment 2015-10-15 10:59:59 +00:00
ptspts@d0db5f2b8c4e6befae8899f31c117d093913f43e
a3d6da5afb Added a comment: renaming oesn't work as expected when changing the extension 2015-10-15 08:54:08 +00:00
PaulK
e862cbd565 2015-10-15 04:34:35 +00:00
PaulK
54aa031bc5 2015-10-15 04:31:51 +00:00
PaulK
eba5045642 2015-10-15 04:28:39 +00:00
https://me.yahoo.com/a/egXXJdRkj_WkxY8aXA9cdIu2fQc-#a61c1
322f02a9c2 2015-10-14 21:34:10 +00:00
https://me.yahoo.com/a/egXXJdRkj_WkxY8aXA9cdIu2fQc-#a61c1
8a01949006 2015-10-14 21:32:28 +00:00
https://me.yahoo.com/a/egXXJdRkj_WkxY8aXA9cdIu2fQc-#a61c1
af66e11f09 2015-10-14 21:30:09 +00:00
https://me.yahoo.com/a/egXXJdRkj_WkxY8aXA9cdIu2fQc-#a61c1
3b314ce5a2 2015-10-14 21:29:15 +00:00
https://me.yahoo.com/a/egXXJdRkj_WkxY8aXA9cdIu2fQc-#a61c1
c15362e586 2015-10-14 21:27:46 +00:00
https://me.yahoo.com/a/egXXJdRkj_WkxY8aXA9cdIu2fQc-#a61c1
e877fde4fc 2015-10-14 21:27:16 +00:00
Joey Hess
daf4f62b0e
word wrap 2015-10-14 13:44:20 -04:00
Joey Hess
3f32670fca
Merge branch 'master' of ssh://git-annex.branchable.com 2015-10-14 12:37:58 -04:00
Joey Hess
9e90c033d3
Changed drop ordering when using git annex sync --content or the assistant, to drop from remotes first and from the local repo last. This works better with the behavior changes to drop in many cases. 2015-10-14 12:33:02 -04:00
anarcat
9d2a602661 timing info 2015-10-13 20:37:41 +00:00
Joey Hess
b0e5c09408
fix various build warnings, mostly on Windows
And some when S3 is disabled
2015-10-13 13:24:44 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
f9547828b7 Added a comment 2015-10-13 16:57:24 +00:00
Joey Hess
06fad42299
put Win32-extras in extra-deps as it's not yet in lts 2015-10-13 12:34:01 -04:00
anarcat
7304e459c3 more notes 2015-10-13 16:02:06 +00:00
anarcat
0106340d4a workarounds 2015-10-13 14:14:16 +00:00
anarcat
741d2aac72 clarification 2015-10-13 11:41:09 +00:00
darkfeline
493ded38a5 Added a comment 2015-10-13 05:24:26 +00:00
Antoine Beaupré
81284e0cdc new bug 2015-10-13 00:48:11 -04:00
darkfeline
7977808b4b 2015-10-13 04:33:24 +00:00
Richard Hartmann
b19f165c9c doc/devblog/day_322-326__concurrent_drop_safety.mdwn: Wording 2015-10-12 22:50:16 +02:00
Joey Hess
18c7b993bd
comment typo 2015-10-12 16:32:52 -04:00
Joey Hess
1ff7610118
fix windows build 2015-10-12 15:48:59 -04:00
Joey Hess
73b26a8b05
Merge branch 'master' of ssh://git-annex.branchable.com 2015-10-12 15:09:47 -04:00
Joey Hess
fb4a745c9b
fix export list to work on windows 2015-10-12 15:08:17 -04:00
Joey Hess
724c004b22
response 2015-10-12 14:55:02 -04:00