Commit graph

20189 commits

Author SHA1 Message Date
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