Joey Hess
158ba9d332
avoid hsc files on Windows
...
This used to work, but now hsc2hs is failing with a usage message.
Since I have not changed my windows build environment at all, it must be
some change due to a change in the cabal file. Perhaps too make flags are
causing it to hit a windows command line length limit?
Anyway, these hsc files did nothing on Windows, so can be omitted and not
built to work around yet another epic windows weirdness.
2013-10-17 16:35:14 -04:00
Joey Hess
c02bc07ce0
avoid even trying to use nice on windows
2013-10-17 16:29:49 -04:00
Joey Hess
b6794f174e
note on nice
2013-10-17 16:13:33 -04:00
Joey Hess
aff125ddab
try working around windows xargs problem
2013-10-17 15:56:56 -04:00
Joey Hess
b7ab2c2ecb
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-17 15:15:17 -04:00
Joey Hess
19816bca41
update for DiffTree type change (which fixes assistant in subdir confusion bug)
2013-10-17 15:11:21 -04:00
Joey Hess
c7b8c776a8
update for DiffTree type change
...
Experimentally, using the raw TopFilePath was right here.
2013-10-17 15:01:23 -04:00
Joey Hess
7206dcb376
update for DiffTree change
...
This actually fixes a bug; if pre-commit was run in a subdir, it would pass
relative files when updating the associated file maps, and so the maps
wouldn't update.
I don't think this bug happened in practice, due to the way pre-commit is
called by the hook. It happened to chdir to the top of the work tree.
2013-10-17 14:52:12 -04:00
Joey Hess
7a9daefea2
update for LsTree type change
...
in the config monitor, we want files relative to the top of the working directory
2013-10-17 14:51:39 -04:00
Joey Hess
d785432f78
use TopFilePath for DiffTree and LsTree
2013-10-17 14:51:19 -04:00
Joey Hess
f40ed91276
update
2013-10-17 14:17:48 -04:00
Joey Hess
4188ad9d7e
repro recipe
2013-10-17 13:48:49 -04:00
Joey Hess
2ddcba7a15
sync: fix crash on first sync when no branch exists yet
2013-10-17 13:34:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
6cd4e78718
Added a comment
2013-10-17 16:04:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
af647b9cfc
Added a comment
2013-10-16 22:47:46 +00:00
Joey Hess
4401df1e57
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-16 16:58:53 -04:00
Joey Hess
117124c670
mini-devblog
2013-10-16 16:54:29 -04:00
Joey Hess
c868b00569
moreinfo
2013-10-16 16:46:23 -04:00
http://joeyh.name/
3d6e799213
Added a comment
2013-10-16 20:45:26 +00:00
http://joeyh.name/
36bead9ff2
Added a comment
2013-10-16 20:42:10 +00:00
Joey Hess
c76c94a0da
S3: Try to ensure bucket name is valid for archive.org.
2013-10-16 16:35:47 -04:00
Joey Hess
02522cba68
Merge branch 'master' of ssh://git-annex.branchable.com
2013-10-16 16:13:09 -04:00
Joey Hess
99c081b87c
test suite found a case that was not properly parsed
2013-10-16 16:10:56 -04:00
Joey Hess
4c6d2c0bbb
close
2013-10-16 16:08:53 -04:00
Joey Hess
af68dcb4cd
test case for e227e8f683
2013-10-16 16:06:05 -04:00
Joey Hess
f6560ffcb7
fix indirect mode conflict merge when only one side is annexed file
...
git-merge's creation of file~HEAD type files did not make this especially
nice to do.
2013-10-16 15:37:06 -04:00
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
http://joeyh.name/
52b8152a32
Added a comment
2013-10-16 18:04:30 +00:00
Joey Hess
6fb6913168
sheesh
2013-10-16 13:15:10 -04:00
http://joeyh.name/
d3690fe707
Added a comment
2013-10-16 16:57:03 +00: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
