Joey Hess
fdb07e4e66
Merge branch 'master' of ssh://git-annex.branchable.com
2014-03-05 18:01:35 -04:00
Joey Hess
a3fe8270ca
annex.startupscan can be set to false to disable the assistant's startup scan.
2014-03-05 17:44:14 -04:00
http://joeyh.name/
c6d8e00f73
Added a comment
2014-03-05 21:08:34 +00:00
http://joeyh.name/
6ed5334924
Added a comment: strace or it didn't happen
2014-03-05 21:02:17 +00:00
Joey Hess
7dab73db84
Merge branch 'master' of ssh://git-annex.branchable.com
2014-03-05 17:00:33 -04:00
Joey Hess
1d78a7b319
retitle bug to something less attractive to entirely unrelated problems
2014-03-05 16:55:03 -04:00
http://joeyh.name/
92a619e144
Added a comment
2014-03-05 20:49:20 +00:00
http://joeyh.name/
7acaa8389a
Added a comment
2014-03-05 20:45:32 +00:00
http://joeyh.name/
aa93a66b4b
Added a comment
2014-03-05 20:40:50 +00:00
http://joeyh.name/
acd08c5492
Added a comment
2014-03-05 20:38:05 +00:00
http://joeyh.name/
95ac7a7548
Added a comment
2014-03-05 20:31:58 +00:00
Joey Hess
96fc3c7edf
Merge branch 'master' of ssh://git-annex.branchable.com
2014-03-05 15:25:50 -04:00
Joey Hess
b793c77f85
done
2014-03-05 14:37:57 -04:00
http://joeyh.name/
d95c075ae4
Added a comment
2014-03-05 18:02:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
f972f8017f
2014-03-05 17:56:29 +00:00
Joey Hess
74d3949cd0
webapp: Include no-pty in ssh authorized_keys lines.
...
git-annex-shell does not need a pty, so this speeds things up.
Also, it may avoid weird misconfigured systems that try to run screen or
tmux on every ssh login from doing so.
2014-03-05 13:53:21 -04:00
Joey Hess
c30cc4a119
update with user feedback
2014-03-05 13:52:23 -04:00
Joey Hess
aa377ed567
webdav: When built with a new enough haskell DAV (0.6), disable the http response timeout, which was only 5 seconds.
2014-03-05 13:51:54 -04:00
Joey Hess
d626a784f3
webapp: detect on first run if git is not installed, and tell the user, rather than crashing non-informatively
...
Mostly for Windows, which has no sane package management..
2014-03-05 13:43:56 -04:00
Joey Hess
ba4df0f112
update roadmap month
2014-03-05 13:27:18 -04:00
http://joeyh.name/
7bdebd3747
Added a comment
2014-03-05 17:11:40 +00:00
Joey Hess
f2ec50ae0f
dup
2014-03-05 13:10:37 -04:00
http://joeyh.name/
6fd1a351fd
Added a comment
2014-03-05 17:08:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
424b1dcc82
Added a comment
2014-03-05 17:07:05 +00:00
Joey Hess
f6df004daa
moreinfo
2014-03-05 13:05:49 -04:00
http://joeyh.name/
8c22a6166e
Added a comment
2014-03-05 16:56:14 +00:00
http://joeyh.name/
27ed79f911
Added a comment
2014-03-05 16:53:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
236c3a2075
Added a comment
2014-03-05 16:11:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlYu7QmD7wrbHWkoxuriaA9XcijM-g5vrQ
69848d7777
Warning messages on Nexus 5
2014-03-05 16:06:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnX1msQxnLoSeu7q-i-c9BWghonsN7Qmns
e8e0b4ee49
Added a comment
2014-03-05 11:47:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e0ce771aa5
Added a comment
2014-03-05 08:10:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
ab253f8339
2014-03-05 06:34:28 +00:00
http://grossmeier.net/
775229a2f4
Added a comment
2014-03-05 04:38:26 +00:00
http://grossmeier.net/
07dcd0eb4b
Added a comment
2014-03-05 04:34:54 +00:00
Joey Hess
7f9a0c153b
thought of another way to break prop_idempotent_key_decode
2014-03-05 00:23:22 -04:00
Joey Hess
e8ab82390e
quickcheck says: "a-s--a" is not a legal key filename
...
Found this in failed armhf build log, where quickcheck found a way to break
prop_idempotent_key_decode. The "s" indicates size, but since nothing comes
after it, that's not valid. When encoding the resulting key, no size was
present, so it encoded to "a--a".
Also, "a-sX--a" is not legal, since X is not a number. Not found by
quickcheck.
2014-03-05 00:10:11 -04:00
Joey Hess
b9d6e70019
fix build w/o TDFA
2014-03-04 23:49:46 -04:00
Joey Hess
3fb291f482
Merge branch 'master' of ssh://git-annex.branchable.com
2014-03-04 23:24:16 -04:00
Joey Hess
1f98d6fb00
glacier: Pass --region to glacier checkpresent.
...
I suppose this is not necessary when it has a local cache, so I didn't
notice it was missing.
2014-03-04 23:22:24 -04:00
http://joeyh.name/
5dcc8555d2
Added a comment
2014-03-05 03:15:44 +00:00
http://joeyh.name/
43ae02e572
Added a comment
2014-03-05 03:14:09 +00:00
Joey Hess
cbf0c972c4
Merge branch 'master' of ssh://git-annex.branchable.com
2014-03-04 23:13:30 -04:00
Joey Hess
785f69afb0
more conflict resolution tests
2014-03-04 23:12:15 -04:00
Joey Hess
8ee3b47d2b
style
2014-03-04 22:55:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA
1aaa7a44cc
2014-03-05 01:25:14 +00:00
Joey Hess
74f94d21fc
devblog
2014-03-04 20:06:55 -04:00
Joey Hess
14d1e878ab
sync: Automatically resolve merge conflict between and annexed file and a regular git file.
...
This is a new feature, it was not handled before, since it's a bit of an
edge case. However, it can be handled exactly the same as a file/dir
conflict, just leave the non-annexed item alone.
While implementing this, the core resolveMerge' function got a lot simpler
and clearer. Note especially that where before there was an asymetric call to
stagefromdirectmergedir, now graftin is called symmetrically in both cases.
And, in order to add that `graftin us`, the current branch needed to be
known (if there is no current branch, there cannot be a merge conflict).
This led to some cleanups of how autoMergeFrom behaved when there is no
current branch.
This commit was sponsored by Philippe Gauthier.
2014-03-04 19:35:55 -04:00
Joey Hess
1fcc5bef66
add test case for merge conflict resolution between annexed and in-git file
2014-03-04 17:44:08 -04:00
Joey Hess
b08ec2752b
added test for conflict resolution with a file that is both deleted and modified
2014-03-04 17:12:26 -04:00
Joey Hess
99295f2c1d
factor out Annex.AutoMerge from Command.Sync
2014-03-04 16:26:15 -04:00
