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
