Joey Hess
78acbfeb6a
ensure merge directory is empty before starting merge
...
Don't want some past failed merge to lead to bad results, potentially.
2013-10-16 14:57:58 -04:00
Joey Hess
e227e8f683
sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory.
...
Note that this case is only fully automatically resolved in direct mode.
In indirect mode, git merge moves the file to file~HEAD, and replaces it
with the directory, and leaves the file in unmerged state, and sync doesn't
yet change that.
2013-10-16 14:56:40 -04:00
Joey Hess
6fb6913168
sheesh
2013-10-16 13:15:10 -04:00
Joey Hess
852871d027
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-16 12:48:19 -04:00
Joey Hess
396e47b07e
tighten file2key to not produce invalid keys with no keyName
...
A file named "foo-" or "foo-bar" was taken as a key's file, with a backend
of "foo", and an empty keyName. This led to various problems, especially
because converting that key back to a file did not yeild the same filename.
2013-10-16 12:46:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
42f447171b
Added a comment: adding ssh server
2013-10-16 16:37:16 +00:00
Joey Hess
15597e5fff
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-16 12:25:09 -04:00
Joey Hess
8b80c340a6
move another bug report out of forum
2013-10-16 12:24:20 -04:00
http://joeyh.name/
b18e5128e0
Added a comment
2013-10-16 16:16:02 +00:00
Joey Hess
7fdefa2b2c
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-16 12:14:48 -04:00
Joey Hess
82ff37520f
fix off-by-one
2013-10-16 12:14:14 -04:00
http://joeyh.name/
692df61599
Added a comment
2013-10-16 16:05:46 +00:00
http://joeyh.name/
ceab0aa358
Added a comment
2013-10-16 15:47:38 +00:00
http://joeyh.name/
68495337bc
Added a comment
2013-10-16 15:19:25 +00:00
http://joeyh.name/
ae7508af0e
Added a comment
2013-10-16 15:14:54 +00:00
Joey Hess
c5cd8729f2
fix inclusion of -gitrev
2013-10-16 10:33:32 -04:00
Joey Hess
3e960994c6
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-16 10:29:17 -04:00
Joey Hess
ecb4a30548
Work around sed output difference that led to version containing a newline on OSX.
2013-10-16 10:28:13 -04:00
fmarier
cdc7f44785
Added a comment: Re: comment 10
2013-10-16 13:43:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkdiXn5s1wX2Zncy1S7_h-yPTv2gt0bmmY
ae9a1c2f79
Added a comment
2013-10-16 11:43:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
09152fcbcd
removed
2013-10-16 09:40:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
fded637db5
Added a comment
2013-10-16 09:40:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
df0e4d3e70
Added a comment
2013-10-16 09:25:05 +00:00
orb
eb46129cde
2013-10-16 01:07:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmCzVCPjgg_Un_114P8iiSwExms0G2csCA
ab78289679
Added a comment: details about my problem
2013-10-15 23:30:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmCzVCPjgg_Un_114P8iiSwExms0G2csCA
c3dc010577
removed
2013-10-15 23:27:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmCzVCPjgg_Un_114P8iiSwExms0G2csCA
287ec803e8
Added a comment: details about my problem
2013-10-15 23:26:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo
2361b497e2
Added a comment: What am I missing?
2013-10-15 21:54:07 +00:00
bla
2a01a7d116
Added a comment: More info on latest autobuild
2013-10-15 21:42:52 +00:00
bla
6f3c6ebde1
Added a comment: Testing
2013-10-15 21:24:35 +00:00
Joey Hess
89345b7108
devblog
2013-10-15 16:16:31 -04:00
Joey Hess
216d4bf10a
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-15 16:06:10 -04:00
Joey Hess
bac078742d
Deal with git check-attr -z output format change in git 1.8.5.
...
I have not actually tested with 1.8.5, which is not yet relesaed, but
git.git commit f7cd8c50b9ab83e084e8f52653ecc8d90665eef2 changes -z
to also apply to output, without regards to back-compat. (But with pretty
good reasons.)
New code should work with both versions, by fingerprinting for NULs and
newlines.
2013-10-15 16:05:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkr_EUIHZ8CTtOGm-j-guMBzaYuOzrXJwg
0719ff2cf3
Added a comment: be aware of the 2-step verification
2013-10-15 20:03:12 +00:00
http://joeyh.name/
c5e9d901ae
Added a comment: I can reproduce this! (with 4.20130923-g78e9013)
2013-10-15 19:57:19 +00:00
RaspberryPie
57203ccf57
Added a comment
2013-10-15 18:49:26 +00:00
http://joeyh.name/
2a93f6285f
Added a comment
2013-10-15 18:29:10 +00:00
http://joeyh.name/
f5d14e52f1
Added a comment
2013-10-15 18:16:24 +00:00
Joey Hess
ad38c2c8e3
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-15 14:12:15 -04:00
Joey Hess
0d88bf9090
move bug report from forum.. sorry, people, but I can't let the forum continually be cluttered up with old bug reports
2013-10-15 14:11:08 -04:00
http://joeyh.name/
2bce401496
Added a comment
2013-10-15 17:53:21 +00:00
http://joeyh.name/
05d1f1bccd
Added a comment
2013-10-15 17:51:05 +00:00
Joey Hess
8cf0e5b105
update schedule docs
2013-10-15 13:42:33 -04:00
Joey Hess
e5e4b80b09
add support for weekly, monthly, and yearly schedules that run on no specific day
2013-10-15 13:27:21 -04:00
Joey Hess
7b82f431ba
need to improve Recurrance
2013-10-14 16:40:48 -04:00
Joey Hess
37c86ef861
devblog
2013-10-14 16:33:23 -04:00
Joey Hess
293f3d2a59
update
2013-10-14 16:29:34 -04:00
Joey Hess
1d1276295b
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-14 16:28:03 -04:00
Joey Hess
0cdb670ea6
Merge branch 'incrementalfsck'
2013-10-14 16:26:51 -04:00
Joey Hess
4a374fa999
commit config changes immediately
2013-10-14 16:24:13 -04:00
