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

20744 commits

Author SHA1 Message Date
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5238da9f73 Added a comment 2016-04-29 13:21:04 +00:00
Gus
ad95032dd7 Added a comment: Branching questions 2016-04-29 12:11:35 +00:00
http://svario.it/gioele
24c224f4f9 Added a comment 2016-04-29 10:26:23 +00:00
CandyAngel
4482caf37d Added a comment 2016-04-29 10:04:55 +00:00
ollie@6d66b5a4b0992998efe3e4c244a66708bf5d96f3
754775a029 2016-04-29 09:50:07 +00:00
Joey Hess
d5ddfa44c4
devblog 2016-04-28 16:19:20 -04:00
Joey Hess
9c7e46c9c5
correction of scope of security problem 
AFAICS, it's not only affecting resumes, but any upload to a special remote
with chunking enabled.
 2016-04-28 16:07:10 -04:00
Joey Hess
9f6c29fb38
pin unix to already installed version 
This prevents multiple versions of unix, from ghc and needed by newer
versions of some packages conflicting.

Had to update the bytestring and blaze-builder pins follow-on from this
change.
 2016-04-28 14:21:57 -04:00
Joey Hess
1f253e84f2
add news item for git-annex 6.20160419 2016-04-28 09:48:45 -04:00
Joey Hess
58b65dd8ee
comment 2016-04-27 17:15:24 -04:00
Joey Hess
d0036b9100
todo 2016-04-27 17:15:02 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
85c17a0085 Added a comment 2016-04-27 17:42:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6b5993fecc Added a comment 2016-04-27 17:41:01 +00:00
Joey Hess
0863102ee6
response 2016-04-27 13:35:33 -04:00
Joey Hess
405214780a
comment 2016-04-27 13:19:48 -04:00
Joey Hess
f31b1ba89b
comment 2016-04-27 13:11:50 -04:00
Joey Hess
32aeff9a8e
comment 2016-04-27 12:57:08 -04:00
Joey Hess
b890f3a53d
Fix bug that prevented resuming of uploads to encrypted special remotes that used chunking. This bug could also expose the names of keys to such remotes. 
This is a low-severity security hole.
 2016-04-27 12:54:43 -04:00
Joey Hess
363b984176
give this bug a sane title 2016-04-27 12:18:00 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6b3fb2dd68 2016-04-27 15:56:18 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
6b2c1e6a7b 2016-04-27 15:26:59 +00:00
thowz
4443e639f3 Added a comment: create symlinks inside .git/annex/objects 2016-04-27 00:36:57 +00:00
sts
d6d9f54ff4 2016-04-26 19:43:20 +00:00
sts
4196cab3dc 2016-04-26 19:42:07 +00:00
sts
f4b67ad75e 2016-04-26 19:40:12 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c674fbae4f initial report 2016-04-26 19:01:24 +00:00
xloem
e623d86acf Added a comment 2016-04-25 21:25:58 +00:00
xloem
0f8866a806 Added a comment: did this today 2016-04-25 20:40:03 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4cece5a33e Added a comment 2016-04-25 18:28:14 +00:00
Joey Hess
7dc0b77783
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-25 13:47:46 -04:00
Joey Hess
cbb4433449
comment 2016-04-25 13:47:27 -04:00
Joey Hess
1ea2b23799
devblog 2016-04-25 13:43:41 -04:00
Joey Hess
4c573815f9
close todos covered by rclone 2016-04-25 13:43:24 -04:00
Joey Hess
e8a7fcc868
clarify tha DIRHASH returns mixed case 
Maybe not the best thing that it does, but it can't really be changed w/o
breaking existing remotes.
 2016-04-25 13:36:13 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
4e0316b22c initial whining 2016-04-25 17:27:25 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ffe2ea2621 Added a comment 2016-04-25 17:21:26 +00:00
Abdo
a59e161796 2016-04-25 11:27:19 +00:00
ddenis
04dd68002d Fixed broken link to standard groups page 2016-04-24 16:19:20 +00:00
zarel
2404ececed Added a comment 2016-04-24 15:31:05 +00:00
CandyAngel
92bc62c22d Added a comment 2016-04-24 10:56:01 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
e91a18f110 added rclone supported providers 2016-04-23 19:22:16 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
26d64d7355 made link a link 2016-04-23 19:14:59 +00:00
branchable@d31204a44f76a567b0ac1ace14680d4f2ec7750d
6cdd633936 mentioned git-annex-remote-rclone 2016-04-23 19:13:49 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
682ce568e4 Added a comment: Further information 2016-04-23 18:31:23 +00:00
annexuser
55b842f1f1 2016-04-23 17:48:31 +00:00
cstork
530d774cd8 Added a comment 2016-04-23 16:43:11 +00:00
fiatjaf
2561fcf699 Added a comment 2016-04-23 15:01:24 +00:00
2a03:4980:13:4d00:21e:64ff:fe1c:1b1a
df3b6800c2 poll vote (Tahoe-LAFS) 2016-04-23 12:19:02 +00:00
2a03:4980:13:4d00:21e:64ff:fe1c:1b1a
11830277af poll vote (My phone (or MP3 player)) 2016-04-23 12:18:55 +00:00
jungle
a1598589e9 2016-04-23 09:42:59 +00:00
jungle
6e30f2a863 This reverts commit f7ced591d3 2016-04-23 09:41:16 +00:00
jungle
f7ced591d3 difference between uninit and unlock 2016-04-23 09:40:20 +00:00
anarcat
cfc6f5bdcf mention jessie backports, use apt, and clarify neurodebian 2016-04-23 04:11:27 +00:00
anarcat
7f1eb0e8ac clarify the fix 2016-04-23 04:08:55 +00:00
Joey Hess
89b3b40eeb
devblog 2016-04-22 16:10:26 -04:00
Joey Hess
154756ca76
response 2016-04-22 16:02:44 -04:00
Joey Hess
e4f159adb3
move 2016-04-22 15:12:09 -04:00
Joey Hess
f38d419781
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-22 15:11:38 -04:00
Joey Hess
4b187ef87b
comment 2016-04-22 15:11:00 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
07ca2bb416 2016-04-22 19:05:45 +00:00
http://id.clacke.se/
d0ee302e64 Added a comment 2016-04-22 19:01:46 +00:00
Joey Hess
0bba2627df
response; improve docs 2016-04-22 14:49:15 -04:00
Joey Hess
7945dd3c3e
refactor 2016-04-22 14:35:48 -04:00
Joey Hess
46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default 
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
 2016-04-22 14:26:44 -04:00
Joey Hess
8ab27235ea
reinject: Added new mode which can reinject known files into the annex. 
For example: git-annex reinject --known /mnt/backup/*
 2016-04-22 13:49:32 -04:00
zarel
d98f6d20d9 Added a comment 2016-04-22 15:27:20 +00:00
zarel
a718cf2344 rename bugs/startup_scan_extremely_slow___40__v6_repo__41__.mdwn to bugs/startup_scan_extremely_slow.mdwn 2016-04-22 15:22:03 +00:00
interstar@551341a1dbca18391e90a3f719eae492868ceb7a
bc3614eba0 Added a comment 2016-04-22 12:38:16 +00:00
http://id.clacke.se/
f0d0e785e6 Added a comment: objecthashlower 2016-04-22 07:58:33 +00:00
http://id.clacke.se/
bf5ac8227b Added a comment: objecthashlower 2016-04-22 07:55:40 +00:00
http://id.clacke.se/
8c3a95b02c Added a comment: Case-sensitive on OSX 2016-04-22 07:53:56 +00:00
http://id.clacke.se/
164fb10308 Added a comment: git-annex is git 2016-04-22 07:44:07 +00:00
interstar@551341a1dbca18391e90a3f719eae492868ceb7a
8e27f35608 2016-04-22 03:14:03 +00:00
Joey Hess
dab3b9c1b1
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-21 14:24:38 -04:00
Joey Hess
b4cb1093bb
todo 2016-04-21 14:24:06 -04:00
pigmonkey
080c3c9cc9 Added a comment 2016-04-21 16:57:03 +00:00
Joey Hess
eb4b556113
calckey can use --backend 2016-04-21 11:23:17 -04:00
cstork
c6c83ccb85 Added a comment 2016-04-21 14:35:46 +00:00
CandyAngel
53c7c246a6 Added a comment 2016-04-21 11:41:09 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
0cf680bdaa Added a comment 2016-04-21 09:00:49 +00:00
cstork
fd5408e1cb Added a comment 2016-04-21 06:46:40 +00:00
Joey Hess
940f1b5cf0
devblog 2016-04-20 16:15:46 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
caba449869 Added a comment 2016-04-20 19:21:33 +00:00
Joey Hess
fcd09badca
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 15:05:02 -04:00
Joey Hess
c3fdaf764d
Isolate test suite from global git config settings. 2016-04-20 15:04:38 -04:00
spwhitton
2c969a94fb Added a comment 2016-04-20 19:01:21 +00:00
Joey Hess
b56218f0c2
Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave. 2016-04-20 14:43:43 -04:00
Joey Hess
da4ff16805
comment 2016-04-20 14:36:46 -04:00
Joey Hess
b143f630c2
comment 2016-04-20 14:27:24 -04:00
Joey Hess
7dfce1f41e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 14:25:09 -04:00
Joey Hess
70016c8dc2
comment 2016-04-20 14:24:26 -04:00
pigmonkey
b245e7b7a1 Added a comment 2016-04-20 18:20:43 +00:00
Joey Hess
5664fce5dd
comment 2016-04-20 14:13:52 -04:00
Joey Hess
052b440e7c
this bug report/rant section has gotten way past diminishing returns, so I am deleting it 
Sorry, but I have no interest in arguing about false equivilances such as
comment 23.
 2016-04-20 14:00:39 -04:00
Joey Hess
a6dfea161f
paren 2016-04-20 13:55:15 -04:00
Joey Hess
0d41657f5c
fixed via time machine 2016-04-20 13:52:49 -04:00
Joey Hess
1bfea9b3e5
calckey: New plumbing command, calculates the key that would be used to refer to a file 2016-04-20 13:50:26 -04:00
Joey Hess
9d952fe9d1
reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Joey Hess
bb92b45fb7
comment 2016-04-20 12:57:22 -04:00
Joey Hess
4c7e835d39
response 2016-04-20 12:55:03 -04:00
Joey Hess
2ee46024c0
followup 2016-04-20 12:51:31 -04:00
Joey Hess
744c236b78
comment 2016-04-20 12:45:58 -04:00
Joey Hess
aa68f2ea7e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-20 12:40:33 -04:00
Joey Hess
f947781fa0
Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed to not hang when it cannot find locale files. 2016-04-20 12:40:11 -04:00
pigmonkey
533370576e 2016-04-20 16:32:36 +00:00
Joey Hess
b949e85045
remove old closed bugs and todo items to speed up wiki updates and reduce size 
Remove closed bugs and todos that were last edited or commented before Q3 2015.

Command line used:

for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
 2016-04-19 13:55:29 -04:00
Joey Hess
a9c7260adb
reopen, comment 2016-04-19 13:27:56 -04:00
Joey Hess
850d0da699
Fix duplicate progress meter display when downloading from a git remote over http with -J. 2016-04-19 13:10:56 -04:00
Joey Hess
e3fb94b006
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-19 12:51:36 -04:00
Joey Hess
60ae80a13a
reproduced 2016-04-19 12:51:20 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
f1f437aada Added a comment 2016-04-19 16:24:50 +00:00
Joey Hess
db8ec3a16a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-19 11:46:24 -04:00
Joey Hess
89d6e5d2f7
comment 2016-04-19 11:33:55 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
0cec13ddf7 added meta that author was mih 2016-04-19 14:49:11 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
55474db92f Added a comment 2016-04-19 14:47:58 +00:00
Joey Hess
eff8673a35
add news item for git-annex 6.20160418 2016-04-18 18:48:36 -04:00
Joey Hess
cd4902068a
releasing package git-annex version 6.20160418 2016-04-18 18:47:55 -04:00
Joey Hess
b83fe02edd
fix link 2016-04-18 16:36:16 -04:00
https://tylercipriani.com/
48de59b580 poll vote (Tahoe-LAFS) 2016-04-18 17:49:35 +00:00
8.44.144.24
75114b0184 poll vote (OpenStack SWIFT) 2016-04-18 17:47:48 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
11de7fac90 Added a comment 2016-04-18 14:16:31 +00:00
Horus
ef61123c4f Added a comment 2016-04-17 14:10:37 +00:00
Horus
b33b998cec Added a comment 2016-04-17 14:10:15 +00:00
http://svario.it/gioele
f24dba7616 Added a comment 2016-04-16 12:53:13 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
8140aa58ea removed 2016-04-16 11:53:24 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
6403964cb6 Added a comment: Assistant support 2016-04-16 11:52:34 +00:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
ab2ba2f37f Added a comment: Assistant support 2016-04-16 11:52:14 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
42f385d537 Added a comment 2016-04-15 12:24:07 +00:00
xloem
d4b3a8a18e 2016-04-15 02:18:43 +00:00
Joey Hess
5d4c235474
response 2016-04-14 17:39:48 -04:00
Joey Hess
6a07ed22cb
comment 2016-04-14 16:08:35 -04:00
Joey Hess
b0876bd6a8
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-14 15:55:54 -04:00
Joey Hess
a9fbd736e2
devblog 2016-04-14 15:55:42 -04:00
Joey Hess
25f7510d29
comment 2016-04-14 15:52:46 -04:00
Joey Hess
3474f48067
comment 2016-04-14 15:43:26 -04:00
Joey Hess
3c2e841d31
comment 2016-04-14 15:42:00 -04:00
Joey Hess
bd516af734
fsck: Warn when core.sharedRepository is set and an annex object file's write bit is not set and cannot be set due to the file being owned by a different user. 
Made all Annex.Perms file mode changing functions ignore errors when
core.sharedRepository is set, because the file might be owned by someone
else. I don't fancy getting bug reports about crashes due to set modes in
this configuration, which is a very foot-shooty configuration in the first
place.

The fsck warning is necessary because old repos kept files mode 444, which
doesn't allow locking them, and so if the mode remains 444 due to the file
being owned by someone else, the user should be told about it.
 2016-04-14 15:36:53 -04:00
Don
db1e7965ea Added a comment 2016-04-14 19:31:52 +00:00
Joey Hess
5cb7f590be
close probably bogus bug and followup 2016-04-14 15:04:50 -04:00
Joey Hess
3a52b3215a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-14 14:56:54 -04:00
Joey Hess
d05a75e45a
fix bug in unlocked file scanner that skipped over executable unlocked files 2016-04-14 13:07:46 -04:00
http://id.clacke.se/
18ce4d573c Added a comment: git-config for manual sync-like operations 2016-04-14 08:21:03 +00:00
Joey Hess
481eb1de03
devblog 2016-04-13 16:40:57 -04:00
Joey Hess
975ec15a86
response 2016-04-13 15:26:18 -04:00
Joey Hess
e462f9a34e
response 2016-04-13 15:23:11 -04:00
Joey Hess
54942c818b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-13 15:11:51 -04:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
ea803d1554 Added a comment: Sharing S3 bucket without fileprefix 2016-04-13 19:02:24 +00:00
Joey Hess
ed68f0c0a0
webapp: Update url to add gitlab.com ssh key. (Psst GitLab.. cool urls don't change!) 2016-04-13 14:49:01 -04:00
Joey Hess
d1da01c2cf
dup? 2016-04-13 14:32:07 -04:00
Joey Hess
944925a646
comment 2016-04-13 14:20:54 -04:00
Joey Hess
7c60f546ef
pointer 2016-04-13 14:16:34 -04:00
Joey Hess
4b5e3b91f3
response 2016-04-13 14:13:01 -04:00
Joey Hess
1010482bc7
webapp: When $HOME is a git repository, and has been initialized for use by git-annex, opening the webapp went ahead and ran the assistant there, annexing all files. Since this is almost certianly not desirable, especially when the user is just opening the webapp from a dekstop menu which happens to run it in $HOME, the webapp will now not treat such a $HOME git repository as a git-annex repository. 2016-04-13 14:07:50 -04:00
Joey Hess
fe1628db11
comment 2016-04-13 14:06:01 -04:00
Joey Hess
fb4949dc1c
response 2016-04-13 13:42:31 -04:00
Joey Hess
b19511822a
update 2016-04-13 13:39:16 -04:00
Joey Hess
402e5adab8
smudge: Print a warning when annex.thin is set, as git's smudge interface does not allow honoring that configuration. 2016-04-13 13:34:24 -04:00
Joey Hess
4e925cb604
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-13 13:01:02 -04:00
Joey Hess
b731ff689c
followup 2016-04-13 12:59:59 -04:00
Joey Hess
addda95c2a
point to git-annx fix from annex.thin docs 2016-04-13 12:49:52 -04:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
a314e77f83 removed 2016-04-13 16:00:50 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
9b6022f5ac Added a comment 2016-04-13 15:58:30 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
d5664aa1f4 removed 2016-04-13 14:36:27 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
accb539ac0 Added a comment 2016-04-13 14:35:39 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
b6174e7621 Added a comment 2016-04-13 10:15:03 +00:00
Jan
a525b75320 Added a comment 2016-04-13 09:05:24 +00:00
Joey Hess
dcf8d3b73f
add news item for git-annex 6.20160412 2016-04-12 16:40:26 -04:00
Joey Hess
08625c5a89
comment 2016-04-12 15:29:01 -04:00
Joey Hess
bbe994295f
Fix build with ghc v7.11. Thanks, Gabor Greif. 2016-04-12 15:27:51 -04:00
Joey Hess
e76cd0ec69
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-12 15:24:50 -04:00
Joey Hess
7815f227d2
update 2016-04-12 14:31:37 -04:00
Joey Hess
fdb6839cf7
update 2016-04-12 14:28:38 -04:00
Joey Hess
630fe90bf3
update 2016-04-12 14:24:48 -04:00
Joey Hess
eac26f13db
Fix bug in annex.largefiles mimetype= matching when git-annex is run in a subdirectory of the repository. 2016-04-12 14:19:34 -04:00
Joey Hess
c672481352
response 2016-04-12 13:40:32 -04:00
Joey Hess
8dbc009b1b
response 2016-04-12 13:16:47 -04:00
Jan
88afa9eb4e Added a comment: git-annex on a PowerPC based synology? 2016-04-12 15:41:24 +00:00
Joey Hess
7d0a078e5c
todo 2016-04-11 11:40:19 -04:00
Joey Hess
113d948cd1
remove incorrect out of dateness warning 2016-04-11 11:26:44 -04:00
hugues.fontenelle@a0dfbe32c0e6575ef1eb2a2f13cd79ee8761de34
2375aec6c4 2016-04-11 10:53:16 +00:00
xloem
359ab36a6b 2016-04-11 01:43:50 +00:00
Antoine Beaupré
c043bd9faf another thing i forgot 2016-04-10 19:20:37 -04:00
Antoine Beaupré
751abdd51f fix for manpage generation without hacks 2016-04-10 19:13:01 -04:00
xloem
20ea3a9f9f 2016-04-10 22:42:11 +00:00
annexuser
642a7b50d4 2016-04-10 20:29:16 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
56098f2ad5 Added a comment 2016-04-10 13:47:30 +00:00
j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077
9090987780 2016-04-10 13:07:32 +00:00
Joey Hess
17acfe8032
devblog 2016-04-09 14:20:34 -04:00
Joey Hess
8623f23aac
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-09 14:18:17 -04:00
Joey Hess
7d28110c68
fix master push overwrite race when updating adjusted branch, by maintaining basis ref 2016-04-09 14:12:25 -04:00
Joey Hess
f0ddc0a75c
comment 2016-04-09 13:22:27 -04:00
spwhitton
bcc5e0bafc file bug 2016-04-09 17:16:07 +00:00
Joey Hess
b3b1d72d57
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-09 12:31:27 -04:00
Antoine Beaupré
a5158baa89 possible fix for markdown generation with pandoc 2016-04-09 11:04:42 -04:00
Antoine Beaupré
c363bea652 attack the manpage problem 2016-04-09 10:40:53 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
d89161e13f Added a comment: freenet special remote 2016-04-09 10:37:23 +00:00
Antoine Beaupré
d1dd9b5a4b respond 2016-04-09 00:41:41 -04:00
ExGen
196547ec8d Added a comment: comment 4 2016-04-08 22:00:33 +00:00
Joey Hess
c2ce3dfed3
windows does not like filenames starting with a dot, rename 2016-04-08 17:08:07 -04:00
ExGen
f970490750 Added a comment: comment 3^^ 2016-04-08 21:03:15 +00:00
Joey Hess
c4be17d159
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-08 15:35:55 -04:00
Joey Hess
973d66bb67
update 2016-04-08 15:31:53 -04:00
Joey Hess
cf06dac2b8
hard links on windows 
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
 2016-04-08 15:25:32 -04:00
Joey Hess
251405eca2
avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
c0008c0c53 2016-04-08 16:35:37 +00:00
ggreif@8132a868199b4ffec14150c87f538dc06a538220
441dfba4c3 pull request for Bup.hs 2016-04-08 16:17:53 +00:00
Joey Hess
f41045bf19
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-06 19:32:01 -04:00
Joey Hess
555e235e1c
devbog 2016-04-06 19:26:25 -04:00
Joey Hess
64de6dcc74
one little bug.. 2016-04-06 19:23:32 -04:00
Joey Hess
60bdffe43e
fix auto merge conflict resolution when doing out of tree merge for adjusted branch 2016-04-06 17:32:04 -04:00
Joey Hess
b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts 
Still needs work when there are actual merge conflicts.
 2016-04-06 15:36:18 -04:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
c0ad345e45 2016-04-06 19:29:51 +00:00
Gus
03e679ce12 2016-04-06 16:05:42 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
3606b2746d Added a comment 2016-04-06 10:14:30 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
1c1a7bdaa4 Added a comment 2016-04-05 22:29:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
8f3c50cb27 Added a comment 2016-04-05 21:28:20 +00:00
Joey Hess
b9c16568ef
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-05 14:30:13 -04:00
Joey Hess
68ef108cb7
another reason 2016-04-05 14:29:33 -04:00
zarel
0fed223e4d Added a comment 2016-04-05 17:24:06 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
9d1c79d48d 2016-04-05 12:49:52 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
70b2621c01 2016-04-05 12:44:18 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
886f5b2d12 Added a comment 2016-04-05 09:19:59 +00:00
szrc
08897ff3a2 Added a comment 2016-04-05 01:18:53 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
ec0fcc8756 Added a comment 2016-04-04 21:21:56 +00:00
Joey Hess
9faf5c8837
devblog 2016-04-04 17:01:46 -04:00
Joey Hess
ea4ca877ce
comment 2016-04-04 17:01:08 -04:00
Joey Hess
398458b0d4
wording 2016-04-04 16:57:13 -04:00
Joey Hess
4c1f46262c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 16:52:47 -04:00
Joey Hess
db98ee6dc1
comment 2016-04-04 16:51:34 -04:00
Antoine Beaupré
d5e0469f68 comment 2016-04-04 16:51:14 -04:00
Antoine Beaupré
7a56f9e9e3 simplify manpage example and ask another question 
sorry for the noise again...
 2016-04-04 16:33:08 -04:00
Joey Hess
374e15663c
response 2016-04-04 16:32:38 -04:00
Joey Hess
20d15f70dd
response 2016-04-04 16:21:30 -04:00
Joey Hess
a3b7032936
comment 2016-04-04 16:16:38 -04:00
Joey Hess
6e576a5336
comment 2016-04-04 16:13:47 -04:00
Joey Hess
4a9b021543
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 16:10:39 -04:00
Joey Hess
5d1ad2b4b2
comment and improve docs 2016-04-04 16:10:05 -04:00
anarcat
7729ca4b14 Added a comment: clarified manpage 2016-04-04 20:00:40 +00:00
Joey Hess
d85d8b08d1
comment 2016-04-04 15:59:20 -04:00
anarcat
50ec2410f8 add examples on how to manually setup the remote keys setup by the assistant 2016-04-04 19:58:43 +00:00
Joey Hess
8e9820d491
comment 2016-04-04 15:55:50 -04:00
anarcat
7c5f43affb ugh. so it works with ~/.ssh/git-annex 2016-04-04 19:51:50 +00:00
Joey Hess
eeb74958a3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 15:44:16 -04:00
Joey Hess
2046502407
v6: Close pointer file handles more quickly, to avoid problems on Windows. 
Was using L.readFile, so the Handle would remain open until the garbage
collector got around to it. Changed to explicit open and close, so we know
it's always closed when the function returns.
 2016-04-04 15:42:33 -04:00
Joey Hess
cfe274e6f7
comment 2016-04-04 15:22:43 -04:00
Joey Hess
52b838d17e
comment 2016-04-04 15:14:58 -04:00
Joey Hess
cc16de7a5b
comment 2016-04-04 15:02:39 -04:00
0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730
953d3accdc Clarified CHECKURL-MULTI syntax 2016-04-04 19:00:04 +00:00
Joey Hess
775bf431c8
comment 2016-04-04 14:58:34 -04:00
Joey Hess
6416411ba1
comment 2016-04-04 14:52:43 -04:00
Joey Hess
f78cbd9f0d
todo 2016-04-04 14:38:29 -04:00
Joey Hess
1720f9f851
still bug with sync in adjusted branch 2016-04-04 13:55:15 -04:00
Joey Hess
7c7f3a0f76
deal with cloning a repo that has an ajdusted branch checked out 2016-04-04 13:51:42 -04:00
Joey Hess
83ac453bc4
update 2016-04-04 13:26:33 -04:00
Joey Hess
17d71ded79
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-04 13:17:46 -04:00
Joey Hess
c3e0859846
Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch. 
This makes the direct mode to v6 upgrade able to be performed in one clone
of a repository without affecting other clones, which can continue using v5
and direct mode.
 2016-04-04 13:17:24 -04:00
anarcat
dfd7a491f1 2016-04-04 14:41:14 +00:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
9162c06055 Added a comment 2016-04-04 11:25:34 +00:00
ovidiu@66ace8a8d99ce938b0538ffa0f26d30db02a9626
df295afb72 Added a comment 2016-04-04 11:24:39 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
95b9bc033b 2016-04-04 06:24:32 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
572d2780eb Added a comment 2016-04-04 06:07:20 +00:00
szrc
f1b7f407ee Added a comment: Local storage of creds 2016-04-04 03:59:02 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
48a786902c Added a comment 2016-04-03 23:00:48 +00:00
timothyhobbs@8b50ff958c937fa4b6de1f9009f464b9ddfc2991
c271a7ad26 Added a comment 2016-04-03 22:30:59 +00:00
ExGen
ace65c6ea2 removed 2016-04-03 20:16:50 +00:00
ExGen
4411894024 removed 2016-04-03 20:16:30 +00:00
ExGen
8cc33aaf0f Added a comment: Found? 2016-04-03 20:15:02 +00:00
ExGen
62e21f63cd Added a comment: O_O 2016-04-03 19:56:01 +00:00
ExGen
a13110a6af Added a comment: O_o 2016-04-03 14:42:29 +00:00
ExGen
34f2c07d01 rename bugs/Get_failed.mdwn to bugs/Windows__58___git_annex_get_failed.mdwn 2016-04-03 14:01:06 +00:00
ExGen
4f610fad39 2016-04-03 14:00:09 +00:00
ExGen
87e4e2e4c2 Added a comment: Same 2016-04-03 13:47:26 +00:00
ExGen
6b2425d7bf Added a comment: Harlinks 2016-04-03 11:21:02 +00:00
gavinwahl@d3a94ffbd6df3b8833a53ff11ec435f58f7c44a9
9c41ad3dbc Added a comment: Shared key - how many keys? 2016-04-03 03:43:58 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
899cb2ddfc 2016-04-03 00:43:14 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
d03f445e77 Added a comment: Makes sense. 2016-04-02 23:41:23 +00:00
ExGen
730e1aee68 Added a comment: Harlinks 2016-04-02 23:32:24 +00:00
Joey Hess
c7b06b879b
Merge branch 'master' of ssh://git-annex.branchable.com 2016-04-02 16:48:03 -04:00
zarel
0522afa067 Added a comment 2016-04-02 20:22:23 +00:00
zarel
2f420e3ca9 2016-04-02 20:16:47 +00:00
tim@5431dd39464df207b7d46d3cf1bc74c82123ac68
083dd8f64e Typo 2016-04-01 21:38:42 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
6509834f3d Added a comment: cache? 2016-04-01 19:56:44 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
ce63557e23 2016-04-01 17:05:04 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
e793a32082 2016-04-01 17:04:21 +00:00
https://me.yahoo.com/a/n0FWjM0duI0IytxNwAsBBv1BvGd8rA--#a9eec
d1621c89cc 2016-04-01 17:02:44 +00:00
Joey Hess
3125b4298b
better example 2016-04-01 10:58:21 -04:00
Joey Hess
11d76f0c8e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-31 19:07:03 -04:00
Joey Hess
92db17e16f
devblog 2016-03-31 19:06:30 -04:00
Joey Hess
ed3e8e1886
Merge branch 'adjustedbranch' 2016-03-31 19:05:47 -04:00
Joey Hess
b7d7cc858e
remove old bug 
I just fixed this one today; it was not the problem I thought it was.
 2016-03-31 18:56:30 -04:00
Joey Hess
12ddb6e8b2
fixed merging of changes from adjusted branch + a remote 2016-03-31 18:54:35 -04:00
Kalle
78ce8fc01c Added a comment: Had what I believe to be the same issue 2016-03-31 21:22:22 +00:00
Joey Hess
860602a1e6
made some progress on syncing adjusted branches, but still buggy 2016-03-31 14:56:10 -04:00
Don
2f239a3705 Added a comment: want everything, but not old versions 2016-03-31 18:50:56 +00:00
Antoine Beaupré
c82d6ba99e explain a bit more 2016-03-31 10:55:20 -04:00
Antoine Beaupré
2819bab344 new script 2016-03-31 10:50:37 -04:00
anarcat
02cdd59bb6 another batch? 2016-03-31 14:08:03 +00:00
Joey Hess
93f5ccc808
update 2016-03-30 16:01:59 -04:00
Joey Hess
20c942108c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-30 15:55:23 -04:00
Joey Hess
d72b85d437
update 2016-03-30 15:55:18 -04:00
anarcat
749e1041b3 workaround 2016-03-30 18:19:17 +00:00
anarcat
625d4bb8f1 more details 2016-03-30 18:11:30 +00:00
anarcat
7935355b7e weird info bug 2016-03-30 18:02:25 +00:00
anarcat
e250bd801b formatting fix 2016-03-30 03:22:00 +00:00
anarcat
9b7ea9aaf6 usability issue with crippled filesystems? not sure how to handle this 2016-03-30 03:21:00 +00:00
Joey Hess
f63b839763
todo 2016-03-29 18:03:02 -04:00
Joey Hess
7afc82cf1d
devblog 2016-03-29 16:47:21 -04:00
Joey Hess
4b4a3b0152
todo 2016-03-29 16:44:09 -04:00
Joey Hess
fb656b9048
log --raw-date: Use to display seconds from unix epoch. 2016-03-29 14:39:16 -04:00
Joey Hess
6301543c00
prevent git-annex adjust changing things out from under the daemon 2016-03-29 13:57:48 -04:00
Joey Hess
8a69298bf2
init: Automatically enter the adjusted unlocked branch when in a v6 repo on a filesystem not supporting symlinks. 2016-03-29 13:54:42 -04:00
Joey Hess
bcd2350fc7
update 2016-03-29 13:30:29 -04:00
Joey Hess
42b7ccc89f
git annex add in adjusted unlocked branch 
Cached the current branch lookup just because it seems unnecessary overhead
to run an extra git command per add to query the current branch.
 2016-03-29 13:26:06 -04:00
Joey Hess
4226ae1040
updae 2016-03-29 12:50:25 -04:00
Joey Hess
4c9ca98769
docs for git-annex adjust 2016-03-29 11:39:43 -04:00
Joey Hess
70e8d6860e
Merge branch 'master' into adjustedbranch 2016-03-29 11:07:40 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
2fd7cc4bfe 2016-03-29 13:27:39 +00:00
Joey Hess
2ba851ff5d
OSX build updated for security fix; old obsolete builds for older versions removed as they contain vulnerable git 2016-03-28 12:51:16 -04:00
Joey Hess
53a1a38aeb
comment 2016-03-28 09:23:53 -04:00
Joey Hess
a60fbce826
comment 2016-03-28 09:21:37 -04:00
http://svario.it/gioele
891fdf7eaa 2016-03-28 09:58:25 +00:00
https://openid.stackexchange.com/user/27ceb3c5-0762-42b8-8f8a-ed21c284748f
7fc51f338c Added a comment: why not mimetypes for preferred content? 2016-03-28 08:32:45 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
f3148c4313 2016-03-27 00:58:22 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
61ad36c67d removed 2016-03-27 00:57:44 +00:00
freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a79425
b476204254 2016-03-27 00:56:57 +00:00
Tobias
541ac227b7 Added a comment: History 2016-03-25 15:24:22 +00:00
185.16.53.225
74fbef73c8 poll vote (Same as for regular git-annex. ~/annex/) 2016-03-24 16:01:43 +00:00
anarcat
e16ba65caf Added a comment: git remote 2016-03-24 14:15:06 +00:00
Kalle
ecc5480828 Added a comment 2016-03-23 21:22:16 +00:00
b@526b37d9a821b5f9ce4e48014422239233ded155
309e16fc36 Added a comment: Fetch files from two (or more) remotes simultaneously? 2016-03-21 22:47:43 +00:00
Tobias
0266c28614 Added a comment: bare repository in direct mode 2016-03-21 21:28:57 +00:00
Kalle
55315a3a58 Added a comment: Different solution 2016-03-21 21:02:58 +00:00
Tobias
c4fb70038f 2016-03-21 10:14:27 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
0dbcc7d6e8 2016-03-21 05:04:58 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
d9657c0449 Added a comment 2016-03-21 04:13:15 +00:00
openmedi
e03c42aaa1 Added a comment 2016-03-19 17:08:19 +00:00
Joey Hess
1889abd874
update 2016-03-18 11:46:03 -04:00
Joey Hess
ff9f3508d9
add news item for git-annex 6.20160318 2016-03-18 11:35:40 -04:00
Joey Hess
63d87261f3
comment 2016-03-18 11:34:26 -04:00
Joey Hess
4fc3a79ea6
update 2016-03-18 11:30:27 -04:00
luukhendrix9@f5b077cf0dfcfec03c5f00e5df3c00279ef5c477
d594fc0146 2016-03-18 13:44:20 +00:00
Joey Hess
204dbf597d
well, that broke the i386ancient autobuilder. revert 2016-03-17 23:42:45 -04:00
Joey Hess
edbd46943f
update 2016-03-17 23:20:50 -04:00
Joey Hess
b482cb9d90
Fix build with stack 0.1.6 which needs explicit-setup-deps. 2016-03-17 23:14:37 -04:00
Joey Hess
4484c6a8b4
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-17 23:08:52 -04:00
Joey Hess
b418bed8d7
tracking bug 2016-03-17 23:08:39 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
eae56e9df3 Added page for mih user 2016-03-17 21:17:15 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
75838ad7ba Initiated page for a "datalad" user to join both yoh and mih pages 2016-03-17 21:16:41 +00:00
nanotech
91341559f7 2016-03-17 09:02:41 +00:00
nanotech
c126021871 Added a comment 2016-03-17 08:39:37 +00:00
torpidus
e029eb8b61 Added a comment 2016-03-16 22:23:26 +00:00
torpidus
0d541a3a23 2016-03-16 22:04:30 +00:00
openmedi
5845622c28 2016-03-16 21:16:07 +00:00
openmedi
4f171baa89 2016-03-16 21:05:31 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
784cb2463b Added a comment: re 2016-03-15 14:14:47 +00:00
Horus
7b84c2fef4 Added a comment 2016-03-15 08:53:15 +00:00
https://christian.amsuess.com/chrysn
91de23966a new issue with sharedRepository introdcued in 5.20151208 2016-03-15 07:58:08 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
786643dbf4 Added a comment 2016-03-14 21:10:56 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
199b0d1dd8 Added a comment 2016-03-14 21:05:06 +00:00
Joey Hess
834b0ac2d9
devblog 2016-03-14 16:53:14 -04:00
Joey Hess
31480a54e2
close 2016-03-14 16:47:32 -04:00
Joey Hess
231a914018
comment 2016-03-14 16:42:29 -04:00
Joey Hess
3a86cdf3e6
comment 2016-03-14 16:39:39 -04:00
Joey Hess
bd4ad3d2e8
comment 2016-03-14 16:37:55 -04:00
Joey Hess
f2772f469a
followup 2016-03-14 15:54:46 -04:00
Joey Hess
11d31f53bf
comment 2016-03-14 13:55:57 -04:00
Joey Hess
5633e8ed50
comment 2016-03-14 13:50:47 -04:00
Joey Hess
dc2da86939
comment 2016-03-14 13:38:41 -04:00
Joey Hess
6bc44d5d16
comment 2016-03-14 13:30:25 -04:00
Joey Hess
7398fc36f2
response 2016-03-14 13:26:26 -04:00
Horus
8f362565a8 Added a comment 2016-03-14 08:18:50 +00:00
torpidus
1d81caedfe 2016-03-13 19:19:13 +00:00
torpidus
82f7582f8f removed 2016-03-13 19:18:39 +00:00
karl
48b2357963 2016-03-13 16:01:03 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
0d9f3bdae0 2016-03-13 11:32:35 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
bef922be21 2016-03-13 11:28:17 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
b28f32e47f 2016-03-13 11:20:49 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
a1765ecf8c 2016-03-13 11:19:39 +00:00
susetux@ed6f4e20192c3eae018e1fc6442bf993d41b3848
e191f127eb 2016-03-13 11:16:09 +00:00
Joey Hess
92877bb5d0
windows git seems to fail to checkout foo.../bar ; rename 2016-03-12 13:57:07 -04:00
Joey Hess
8b653bf9ef
remove danging comment with * in its filename 2016-03-12 13:51:25 -04:00
Joey Hess
348105debc
fix links 2016-03-12 13:47:31 -04:00
Joey Hess
2eae70353d
remove note about cygwin git 2016-03-12 13:45:31 -04:00
Joey Hess
4205e93c1e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-12 12:58:02 -04:00
Joey Hess
7125a1fb27
rename files containing : 
This is mostly to let the repo check out on windows w/o using cygwin's git.

But, bash completion is also crap with : , so ..
 2016-03-12 12:57:18 -04:00
Richard Hartmann
b1b80e6dec Typo 2016-03-12 15:13:46 +01:00
Joey Hess
7a01f60eed
update 2016-03-11 20:16:02 -04:00
Joey Hess
cc44813550
simplify 2016-03-11 20:12:31 -04:00
Joey Hess
26405c107a
devblog 2016-03-11 19:55:27 -04:00
Joey Hess
b9184f69a7
improve propigation of commits from adjusted branches 
Only reverse adjust the changes in the commit, which means that adjustments
do not need to be generally cleanly reversable.

For example, an adjustment can unlock all locked files, but does not need
to worry about files that were originally unlocked when reversing, because
it will only ever be run on files that have been changed. So, it's ok
if it locks all files when reversed, or even leaves all files as-is when
reversed.
 2016-03-11 16:05:06 -04:00
Joey Hess
97e97dccda
Merge branch 'master' into adjustedbranch 2016-03-11 12:21:26 -04:00
mark@6b90344cdab3158eacb94a3944460d138afc9bef
c20e8d17db 2016-03-10 22:46:42 +00:00
Horus
662fc7fc75 2016-03-10 21:40:31 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
11a5985389 2016-03-10 15:16:33 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
7ca35b766f Added a comment 2016-03-10 04:36:12 +00:00
ellis
ea57543394 Added a comment 2016-03-09 19:15:10 +00:00
Joey Hess
9039bdb4ea
Always try to thaw content, even when annex.crippledfilesystem is set. 2016-03-09 13:33:13 -04:00
Joey Hess
d201e6c359
add todo from comment 2016-03-09 13:21:55 -04:00
Joey Hess
e4c22ad5bb
comment 2016-03-09 13:15:43 -04:00
Joey Hess
5e0843e4b8
close 2016-03-09 13:14:27 -04:00
Joey Hess
0cdd4f9f58
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-09 13:13:28 -04:00
Joey Hess
c6f81e8ef5
done 2016-03-09 12:54:22 -04:00
Joey Hess
01f0dfc4ff
followup 2016-03-08 16:42:43 -04:00
ellis
70bf11d3d0 Added a comment 2016-03-08 19:52:21 +00:00
ellis@9dd4c3615b5ff78a457c5832488610886fd6b255
05b4d9cc98 Added a comment 2016-03-08 19:26:03 +00:00
Joey Hess
b095561e70
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-07 16:26:30 -04:00
Joey Hess
3454b8bc33
devblog 2016-03-07 16:24:39 -04:00
Horus
951857d31f Added a comment 2016-03-07 20:11:03 +00:00
Joey Hess
9cff9ff02c
response 2016-03-07 15:13:01 -04:00
Joey Hess
4cef8739bb
comment 2016-03-07 13:26:05 -04:00
Joey Hess
d3775e741e
followup 2016-03-07 13:24:11 -04:00
Joey Hess
e8d6dc9527
followup 2016-03-07 13:21:47 -04:00
Joey Hess
a07fd19ce9
dropkey --json 2016-03-06 12:58:36 -04:00
Joey Hess
78fa865721
dropkey: Add --batch. 2016-03-06 12:45:57 -04:00
Joey Hess
8a54643618
update flag list 2016-03-05 17:33:52 -04:00
Joey Hess
59bad9681b
i386ancient build switched to stack, has more flags enabled 2016-03-05 17:16:46 -04:00
Joey Hess
0084e0f053
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-05 12:29:43 -04:00
Joey Hess
5f3fa4642e
close bug about removed code 2016-03-05 11:32:05 -04:00
Joey Hess
40c15871d5
remove LGPL, after removing the LGPLed file 2016-03-05 11:24:05 -04:00
ellis@9dd4c3615b5ff78a457c5832488610886fd6b255
1d6ab9b065 2016-03-05 12:19:50 +00:00
ellis@9dd4c3615b5ff78a457c5832488610886fd6b255
d6bfa533b5 2016-03-05 12:18:48 +00:00
workspace
c2a0a900dd Added a comment: same problem 2016-03-04 20:44:26 +00:00
Joey Hess
5716c39928
thought on reversing commits to adjusted branch 2016-03-04 11:31:26 -04:00
frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a
f49570857c Added a comment 2016-03-04 14:06:17 +00:00
edward
c8f777a593 fix link 2016-03-04 10:44:54 +00:00
Joey Hess
51ddb84ca2
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-03 17:20:28 -04:00
Joey Hess
292414aa4f
devblog 2016-03-03 17:19:11 -04:00
Joey Hess
cf24e9b892
working toward adjusted commit propigation 2016-03-03 16:19:09 -04:00
Joey Hess
7811556a5b
Merge branch 'master' into adjustedbranch 2016-03-03 15:40:25 -04:00
Joey Hess
91f37673df
can't checkout adjusted branch while index is still locked 
There's a race here, but entering an adjusted branch for the first time is
not something to do when a commit is being made at the same time. Although,
may want to prevent the assistant from committing while entering the
adjusted branch.
 2016-03-03 14:20:39 -04:00
Horus
0aec17ea55 Added a comment 2016-03-03 18:17:35 +00:00
acbg@8d58f794ce92f6be28b5dbd402059bc30262eb92
b1217e0a5a Added a comment: Since which version does this apply? 2016-03-03 16:16:28 +00:00
Horus
23e2c0723e 2016-03-03 16:03:06 +00:00
frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a
f09c54aa8e 2016-03-03 13:01:05 +00:00
chip@9a7a3f3780ecacd7b38b0b0adad50046c9b2895b
8722bc865d 2016-03-03 06:00:05 +00:00
chip@9a7a3f3780ecacd7b38b0b0adad50046c9b2895b
c81b2b9213 2016-03-03 05:59:02 +00:00
mih
554d9339b6 Added a comment: Thanks 2016-03-02 19:30:49 +00:00
Joey Hess
17a3885119
comment 2016-03-02 13:15:24 -04:00
Joey Hess
223eaf2efd
Merge branch 'master' of ssh://git-annex.branchable.com 2016-03-02 12:25:59 -04:00
Joey Hess
baa9954e06
Fix metadata hook behavior when multiple files are added at once. Thanks, Klaus Ethgen. 2016-03-02 12:25:41 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
bd83c16586 Added a comment 2016-03-01 22:40:45 +00:00
Joey Hess
12f7c0724f
followup 2016-03-01 16:58:19 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
cd067a57a0 Added a comment 2016-03-01 20:43:17 +00:00
Joey Hess
181f9457ee
update 2016-03-01 16:42:36 -04:00
Joey Hess
e35001ad6b
followup 2016-03-01 16:34:41 -04:00
Joey Hess
5b664053e0
comment 2016-03-01 16:24:04 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
ea0bf2be70 Added a comment 2016-03-01 18:58:21 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
06294a3324 Added a comment 2016-03-01 18:54:15 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
3fe3d5c23a Added a comment: recent snapshot seems has fixed it 2016-03-01 18:52:28 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
647fffd7ef Added a comment: more info 2016-03-01 17:31:29 +00:00
Joey Hess
8933c21b5e
moreinfo 2016-03-01 12:54:01 -04:00
Joey Hess
ad888a6b76
Fix bug preventing moving files to/from a repository with annex.pidlock set. 2016-03-01 12:51:54 -04:00
Joey Hess
3e91cd13ba
Fix data loss that can occur when annex.pidlock is set in a repository. 2016-03-01 12:12:57 -04:00
Joey Hess
2f48c0aa7c
comment 2016-03-01 11:42:40 -04:00
Joey Hess
a7df5c6867
comment 2016-03-01 11:39:34 -04:00
Joey Hess
802f0f7c8a
reopen 2016-03-01 10:48:00 -04:00
Joey Hess
439bc31b0f
comment 2016-03-01 10:36:52 -04:00
bvaa
f6e1770426 Added a comment: similar problem 2016-03-01 08:12:27 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
1f2e7fea6a Added a comment 2016-03-01 07:10:56 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5f0c8efb9a initial whining 2016-03-01 00:33:44 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
36224d99fd 2016-03-01 00:04:51 +00:00
Joey Hess
eb4faba81a
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-29 17:40:24 -04:00
Joey Hess
c23b82dc27
devblog 2016-02-29 17:39:38 -04:00
Joey Hess
102229fc67
need to update master 2016-02-29 17:39:06 -04:00
Joey Hess
70e65db751
note a bug 2016-02-29 17:30:37 -04:00
michael.hanke@c60e12358aa3fc6060531bdead1f530ac4d582ec
36840ff2d7 2016-02-29 19:18:32 +00:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
ce9e00f8dc Added a comment 2016-02-29 17:25:17 +00:00
Joey Hess
e520366c4d
metadata: Added -r to remove all current values of a field. 2016-02-29 13:00:46 -04:00
Joey Hess
4763004632
add news item for git-annex 6.20160229 2016-02-29 12:56:56 -04:00
Joey Hess
5c23b8b49a
forgot to add this comment earlier 2016-02-29 12:41:39 -04:00
Joey Hess
37a89cca43
comment 2016-02-29 11:52:20 -04:00
grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f
2d5039fff6 2016-02-29 06:22:05 +00:00
Joey Hess
36ba39c4f3
remove lower-casing of field names; metadata fields are case-insensative 2016-02-28 11:56:55 -04:00
Joey Hess
79a7bed2d7
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-28 11:11:43 -04:00
Joey Hess
764e57f1f1
The pre-commit-annex hook script that automatically extracts metadata has been updated to also use exiftool. Thanks, Klaus Ethgen. 2016-02-28 11:10:55 -04:00
page
e164d530f9 Added a comment: Some additional notes 2016-02-28 11:44:39 +00:00
Joey Hess
b946ca44c3
Support --metadata field<number, --metadata field>number etc to match ranges of numeric values. 
Similarly (well, for free), support preferred content expressions like
metadata=field<number and metadata=field>number
 2016-02-27 10:55:02 -04:00
Joey Hess
01f1de0c3c
close bug and changelog 
finished testing recent commits, and I did solve it
 2016-02-26 16:51:28 -04:00
Joey Hess
41fd029c9b
update 2016-02-26 13:54:58 -04:00
Joey Hess
66f2b3d4e0
bug 2016-02-26 13:49:26 -04:00
Joey Hess
fe44eb95e2
close 2016-02-26 13:36:17 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5d0b5eeefb 2016-02-26 04:04:40 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5e5f8f1a74 2016-02-26 03:59:37 +00:00
divergentdave@5c17d06f6d67c6f157b76a4cc95ca764b7d2f899
e815b5c23c Added a comment 2016-02-26 03:56:42 +00:00
Joey Hess
448c1cc057
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-25 17:13:16 -04:00
Joey Hess
44f1672e37
devblog 2016-02-25 17:12:41 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
229db26e83 Added a comment: would it be possible to get a branch only with annexed content? 2016-02-25 03:04:26 +00:00
tom_clune
288326f121 Added a comment: dropping files after changing branches/tags 2016-02-24 22:19:00 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
969755804a 2016-02-24 21:42:28 +00:00
tom_clune
c6d0e3e62e Added a comment: git annex using the "wrong" ssh socket 2016-02-24 19:23:13 +00:00
matyasbot@fd008517d046c382e18306c0b3db48eb58d45dee
a11aaf4f99 2016-02-24 19:14:42 +00:00
https://me.yahoo.com/a/ZF7p46cPmpWtb9zvA8iTitPmiQ--#eb014
8c97f9e40f 2016-02-24 03:55:44 +00:00
Joey Hess
2c29ca8c14
devblog 2016-02-23 16:57:01 -04:00
Joey Hess
53ad65612e
todo 2016-02-23 16:54:31 -04:00
Joey Hess
2bf90c7b56
updates 2016-02-23 13:21:38 -04:00
Joey Hess
66ce77f2d4
relocate page 2016-02-23 12:06:30 -04:00
Joey Hess
436251715c
comment 2016-02-23 11:39:58 -04:00
Joey Hess
67dc0d238f
disable new build flags for android build 2016-02-23 10:59:59 -04:00
Joey Hess
5eab84dd3f
improve docs 2016-02-23 10:46:42 -04:00
Joey Hess
0218fe95ac
Merge branch 'master' of ssh://git-annex.branchable.com 2016-02-23 10:30:46 -04:00