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
41b7c5f6aa
implement another adjustment -- easy to do now!
2016-03-11 19:54:10 -04:00
Joey Hess
a85196bd4e
simplify adjustment reversal
2016-03-11 19:41:11 -04:00
Joey Hess
6c023e14ef
grafting new items into existing tree
2016-03-11 19:29:43 -04:00
Joey Hess
ad04550055
refactor
2016-03-11 16:45:40 -04:00
Joey Hess
f3b9c48a09
fixme
2016-03-11 16:37:31 -04:00
Joey Hess
ba1ef156a2
fix deletion of files in adjustTree
2016-03-11 16:30:06 -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
3c4ad3eeca
indent
2016-03-11 14:46:54 -04:00
Joey Hess
ec8eba18ad
fix warning
2016-03-11 14:33:38 -04:00
Joey Hess
fed8fcb99f
allow adding new items via adjustTree
2016-03-11 14:08:06 -04:00
Joey Hess
8d124beba8
add commitDiff, and clean up partial function
2016-03-11 13:15:49 -04:00
Joey Hess
fbf4d89e82
extract commit parent(s)
2016-03-11 12:47:14 -04:00
Joey Hess
97e97dccda
Merge branch 'master' into adjustedbranch
2016-03-11 12:21:26 -04:00
Joey Hess
cbd38ef367
remove redundant start message
2016-03-09 15:04:00 -04:00
Joey Hess
fef272687e
Merge branch 'master' of ssh://git-annex.branchable.com
2016-03-09 13:46:41 -04:00
Joey Hess
4b3355cf3c
refactor
2016-03-09 13:43:22 -04:00
Joey Hess
276a67184c
fix typo in flags
2016-03-09 13:39:00 -04: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
viric@582d0845fdeae54b262502f49509b4577a5adbf8
3b081713ed
2016-03-09 16:44:05 +00:00
mail@f1d77c48f528d8c7b885900281887e045ad5114e
8f8ccc3899
Added a comment: Solution
2016-03-09 16:03:35 +00:00
mail@f1d77c48f528d8c7b885900281887e045ad5114e
83d321a72c
2016-03-09 11:24:27 +00:00
ellis
9f091ea5e8
Added a comment
2016-03-09 10:04:15 +00:00
Joey Hess
ec376cf1cb
adjust architecture lists
2016-03-09 00:34:18 -04:00
nasava
7007c23cc5
Added a comment: Ancient variant for Armel
2016-03-08 22:02:29 +00:00
torpidus
08c3c165de
2016-03-08 21:36:24 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
5a3bc8baf8
2016-03-08 21:01:06 +00: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
6623b557ed
build without disk-free-space on android
2016-03-08 02:45:10 -04: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
8bed51ae95
use clamav to check builds for viruses before adding them
...
Had to workaround various problems in clamscan. Increased its max filesize
a lot, because it's too small to check git-annex. Manual unpacking seemed
to be needed for dmg and tar.gz.
2016-03-07 15:54:27 -04: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
ab5f7b05f5
Fix OSX dmg to include libraries needed by bundled gpg, lost in last release.
2016-03-07 12:55:01 -04:00
Joey Hess
9a8cdc3652
merge from propellor
2016-03-06 20:09:05 -04:00
Joey Hess
a07fd19ce9
dropkey --json
2016-03-06 12:58:36 -04:00
Joey Hess
acf74ae945
improve json when showStart' is given only a key
...
Before, the json contained file:key; change that to key:
If a file and a key are given, inclue both file: and key:
2016-03-06 12:57:24 -04:00
Joey Hess
78fa865721
dropkey: Add --batch.
2016-03-06 12:45:57 -04:00
