Richard Hartmann
b70af62185
Typo
...
Combed with extra fine teeth just to make Joey happy ;)
2013-05-18 09:59:53 +02:00
Joey Hess
5482a7b505
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-17 21:51:14 -04:00
http://yarikoptic.myopenid.com/
c8bc9886a2
Added a comment: Follow-up information on my system
2013-05-18 01:23:28 +00:00
Joey Hess
0db3e02088
ignore test suite failure until it has been gotten to work on windows
2013-05-17 19:59:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM
4f6d602f8f
Fixed a typo
2013-05-17 22:39:50 +00:00
http://joeyh.name/
4090125a1b
Added a comment
2013-05-17 22:28:34 +00:00
Joey Hess
48a19771c6
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-17 18:24:52 -04:00
Joey Hess
3174447a1d
blog for the day
2013-05-17 18:24:21 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
3a0bd23c89
2013-05-17 21:20:42 +00:00
Joey Hess
ba49fc74c8
clean up test dir
2013-05-17 17:01:20 -04:00
Joey Hess
cbed6fe65f
run test suite in cygwin so it can find utilities etc
2013-05-17 16:58:36 -04:00
Joey Hess
de3853375e
better message
2013-05-17 16:52:50 -04:00
Joey Hess
142bd163a2
ssh warnings
2013-05-17 16:51:46 -04:00
Joey Hess
7f6a82df67
can't test gpg on Windows yet
2013-05-17 16:49:34 -04:00
Joey Hess
b26e20fa59
use posixcompat
2013-05-17 16:47:25 -04:00
Joey Hess
8779ad1be9
try building test suite on windows
2013-05-17 16:45:44 -04:00
Joey Hess
1e7682cf0d
update
2013-05-17 16:35:35 -04:00
Joey Hess
29615eb311
run test suite on windows autobuilder
2013-05-17 16:34:19 -04:00
Joey Hess
1b616c5d37
improve handling of receiving object in direct mode when associated files are modified
...
Before, if a direct mode repo had one or more associated files that
were modifed, moving the object into it would overwrite the associated
files with the pristine object.
Now, modified associated files are left unchanged. To ensure that,
when an object is moved into a direct mode repo, it's not thrown away,
it gets stored in indirect mode.
2013-05-17 16:25:18 -04:00
Joey Hess
7bcfa88e6b
fix
2013-05-17 16:25:12 -04:00
Joey Hess
94cb037aa3
store copy in inode cache too
2013-05-17 16:16:10 -04:00
Joey Hess
b8e5b9c645
test suite passes in direct mode
...
This fixes a bug with git annex add in direct mode. If some files already
existed in the tree pointing at the same key as a file that was just added,
and their content was not present, add neglected to copy the content to
those files.
I also changed the behavior of moveAnnex slightly: When content is moved
into the annex in direct mode, it does not overwrite any content already
present in direct mode files. That content may be modified after all.
2013-05-17 15:59:37 -04:00
Joey Hess
90d44f09eb
don't warn about existence of pre-commit hook if it already has the right content
2013-05-17 15:59:03 -04:00
Joey Hess
ba0c165704
fsck behavior varies in direct mode when the file is modified
2013-05-17 15:20:21 -04:00
Joey Hess
a5dc269cd7
disable unused test in direct mode
...
This test is actually pointing at a problem, with
getKeysPresent in direct mode. When a file is git rm -f'd,
this removes its content, but it's still listed by getKeysPresent.
However, unused is fairly useless in direct mode, and the test
needs to be updated to handle other differences, so disable it for now
2013-05-17 15:16:28 -04:00
Joey Hess
bc2dcee514
disable stuff that is not supported in direct mode
...
Also fixed a git rm that failed due to seeing modified file content
in direct mode.
2013-05-17 15:00:33 -04:00
Joey Hess
83db599b6e
remove old comments, there is a build script now
2013-05-17 14:36:47 -04:00
Joey Hess
51592944a2
fix link
2013-05-17 14:36:16 -04:00
Joey Hess
67dfd3b4c6
cleanup
2013-05-17 14:26:29 -04:00
Joey Hess
dcf46bde1b
syntax fix
2013-05-17 14:24:07 -04:00
Joey Hess
c2e279b6ce
don't hardcode path to cygwin stuff, look for it in PATH
2013-05-17 14:19:08 -04:00
Joey Hess
b1b332592f
specify makensis path in build script
2013-05-17 14:06:47 -04:00
Joey Hess
ddf98cd644
update
2013-05-17 13:45:33 -04:00
Joey Hess
4ba6a88aba
update with autobuilder
2013-05-17 13:38:45 -04:00
Joey Hess
cfae7841a4
export
2013-05-17 13:38:40 -04:00
Joey Hess
3b87732166
disable cygwin warnings
2013-05-17 13:23:05 -04:00
Joey Hess
ca66b64056
fixes
2013-05-17 13:16:21 -04:00
Joey Hess
5589991993
bad hunk
2013-05-17 13:12:17 -04:00
Joey Hess
00aa861b39
work around strange MissingH build fail on windows, that I cannot reproduce here
2013-05-17 13:10:41 -04:00
Joey Hess
74529501ba
disable xmpp
2013-05-17 12:31:19 -04:00
Joey Hess
86912bc498
add new dep
2013-05-17 12:10:46 -04:00
Joey Hess
eec98c8655
fix path to cabal
2013-05-17 12:03:20 -04:00
Joey Hess
e4fe40da6e
update
2013-05-17 11:54:36 -04:00
Joey Hess
14ba77c632
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-17 11:39:48 -04:00
Joey Hess
054422b12f
fix path
2013-05-17 11:38:29 -04:00
Joey Hess
39ac8d18ed
Sanitize debian changelog version before putting it into cabal file. Closes : #708619
2013-05-17 11:24:18 -04:00
Joey Hess
ebe10edf67
add dep needed with newer ghc
2013-05-17 11:24:07 -04:00
basak
5fef411563
Added a comment
2013-05-17 08:35:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmubB1Sj2rwFoVdZYvGV0ACaQUJQyiJXJI
434f9adcf4
Added a comment: Continued work
2013-05-17 07:44:38 +00:00
http://a-or-b.myopenid.com/
516d4c3641
2013-05-17 00:54:51 +00:00
