Farhan Kathawala
922371d5df
Fixed bug: webapp should notice when remote deletion cannot complete due to not syncing
2016-06-13 21:52:19 -04:00
Joey Hess
35dbe35007
add news item for git-annex 6.20160613
2016-06-13 16:18:47 -04:00
Joey Hess
1e4e6f4737
devblog
2016-06-13 16:18:13 -04:00
Joey Hess
6b3dd76b02
fix build warning with new version of QuickCheck
2016-06-13 16:00:23 -04:00
Joey Hess
d6ef932645
fix build with old ghc
2016-06-13 15:53:02 -04:00
Joey Hess
43d9d757ee
fix build with old ghc
2016-06-13 15:25:05 -04:00
Joey Hess
de395dc48c
prep release
2016-06-13 14:57:52 -04:00
Joey Hess
142710d1b4
fix build on windows
2016-06-13 14:54:34 -04:00
Joey Hess
8657a5a3db
close
2016-06-13 14:20:28 -04:00
Joey Hess
bfd00a0f8c
v6: Fix bad merge in an adjusted branch that resulted in an empty tree.
2016-06-13 14:18:22 -04:00
Joey Hess
f4e2581056
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-13 12:59:59 -04:00
Joey Hess
b0682f2b5f
add test case for http://git-annex.branchable.com/bugs/Assistant_keeps_deleting_all_the_files_in_my_repo/
2016-06-13 12:59:10 -04:00
Joey Hess
b66e517b28
reproduced
2016-06-13 12:38:11 -04:00
ivan.iossifov@2673267f2e818d14a75f506d41738323cbc0bd04
6c39ea1a06
Added a comment: how do I get the autobuild?
2016-06-13 13:56:12 +00:00
cruisevx1@a754a154d8ebc70ae870cdcc7ffa9b2199ff3803
f436f97699
2016-06-13 02:23:15 +00:00
Rémi
be3a92cc59
Question about git-annex fsck on bare repository
2016-06-12 12:54:27 +00:00
Joey Hess
bfe90e6a8c
comment
2016-06-10 15:42:54 -04:00
jgoerzen
89d3f6ca07
2016-06-10 18:31:12 +00:00
jgoerzen
8da64bb15b
Added a comment: Seeing this everywhere
2016-06-10 16:59:46 +00:00
Maurice_Moss
047ec64c46
2016-06-10 13:42:57 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
a34df513fc
2016-06-09 23:28:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
cae5542095
2016-06-09 21:10:44 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
de165cf08d
Added a comment
2016-06-09 20:49:53 +00:00
Joey Hess
1fed64db26
filter out NoUUID remotes from syncDataRemotes
2016-06-09 16:38:47 -04:00
Joey Hess
43939c67d3
devblog
2016-06-09 16:36:26 -04:00
Joey Hess
0ea1969275
update test suite for lock/unlock with missing file content change in v6
2016-06-09 16:16:39 -04:00
Joey Hess
59f59de72e
followup
2016-06-09 16:04:21 -04:00
Joey Hess
7f5df6993c
add comment
2016-06-09 15:49:40 -04:00
Joey Hess
0fa04f4470
followup
2016-06-09 15:49:18 -04:00
Joey Hess
a8f2f29da1
pin crytonite on android to 0.15, which is the version I've been using
2016-06-09 15:34:37 -04:00
Joey Hess
a17845f75b
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-09 15:25:32 -04:00
Joey Hess
3789e6dab8
note
2016-06-09 15:25:16 -04:00
Joey Hess
b146e13bff
highlight v6 changes
2016-06-09 15:17:54 -04:00
Joey Hess
b6b5a11601
Make git clean filter preserve the backend that was used for a file.
2016-06-09 15:17:08 -04:00
Joey Hess
78952c1fcf
close
2016-06-09 14:47:07 -04:00
Joey Hess
7fe2ecff91
Fix update of associated files db when unlocking a file in a v6 repo.
2016-06-09 14:45:00 -04:00
Joey Hess
0bc7fee660
Make lock and unlock work in v6 repos on files whose content is not present.
2016-06-09 14:40:44 -04:00
Joey Hess
0249f3aff5
Fix bug in initialization of clone from a repo with an adjusted branch that had not been synced back to master.
...
This bug caused broken tree objects to get built by a later git annex sync.
This is a somewhat unlikely but not impossible situation, and the test
suite's union_merge_regression test tickled it when it was run on FAT.
2016-06-09 14:11:00 -04:00
openmedi
60dab21e18
2016-06-08 19:46:39 +00:00
Joey Hess
8e4cbefbc6
also avoid crashing in most circumstances if unable to determine the username
...
Mostly the username is only used for the git committer or other display
purposes, and we can just fall back to a dummy value in these cases.
The only remaining place where an error is thrown is when starting local
pairing, which needs the username to be known.
2016-06-08 15:04:15 -04:00
Joey Hess
a3ff99ea3b
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-08 14:29:37 -04:00
jgoerzen
8fb9d925ba
Added a comment: Still seeing this
2016-06-08 18:03:51 +00:00
Joey Hess
d62d81ee1c
Avoid a crash if getpwuid does not work, when querying the user's full name.
2016-06-08 13:48:03 -04:00
Joey Hess
88c85ae609
remove spam
2016-06-08 13:29:46 -04:00
Joey Hess
34c4640f66
devblog
2016-06-07 16:00:52 -04:00
Joey Hess
abeb2a6b81
Merge branch 'master' of ssh://git-annex.branchable.com
2016-06-07 13:25:38 -04:00
Joey Hess
9569d6be63
Fix bad automatic merge conflict resolution between an annexed file and a directory with the same name when in an adjusted branch.
...
When running in an overlay work tree, all unchanged files show as deleted,
so this code that stages deletions should not run.
2016-06-07 12:53:35 -04:00
ivan.iossifov@2673267f2e818d14a75f506d41738323cbc0bd04
04e408d6ae
2016-06-07 14:07:06 +00:00
chris@f4ea67aa5ae4709d79959f782fcebb5edae9a79b
d25b67a09c
Added a comment
2016-06-07 13:40:24 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
b40d13167e
2016-06-07 02:38:50 +00:00