Joey Hess
eba9ee5bc6
remove debug print
2013-05-27 11:18:18 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
51280d3fee
2013-05-27 11:04:44 +00:00
http://sam.mingolelli.pip.verisignlabs.com/
55475186a9
initial add
2013-05-27 09:06:53 +00:00
79.207.25.10
2928fdb466
poll vote (/sdcard/annex)
2013-05-27 06:39:56 +00:00
http://joeyh.name/
d4bf0c3d0b
Added a comment
2013-05-27 05:03:05 +00:00
http://edheil.wordpress.com/
73147c497a
Added a comment
2013-05-27 01:57:25 +00:00
http://joeyh.name/
b1d8cf2da4
Added a comment
2013-05-27 01:48:43 +00:00
Joey Hess
1b5309d6d8
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-26 21:45:50 -04:00
http://tiker.net/openid/
dfdabe001e
2013-05-27 01:41:39 +00:00
Joey Hess
c15a0b796e
3 more fd leaks
2013-05-26 21:27:44 -04:00
http://edheil.wordpress.com/
ec8ea4e7f1
2013-05-27 01:24:25 +00:00
Joey Hess
c092b4fc16
XMPP: Fix a file descriptor leak.
2013-05-26 20:49:16 -04:00
Joey Hess
18b92f97fe
blog for the 1/2 day
2013-05-26 18:42:50 -04:00
Joey Hess
f1cce62283
fix merge conflict resolution when both sides have the same key
...
Still need to git rm the old file so git accepts the merge is resolved.
2013-05-26 18:32:11 -04:00
Joey Hess
749beb5899
fix Android build, broken for 2 days
2013-05-26 18:14:03 -04:00
Joey Hess
2180068e30
correct recent fix
...
fc37456d0fe1fb0fd3e33338223977b3e7a940bb's fix caused it to try to stage a
symlink in .git/annex/tmp, oops
2013-05-26 18:10:07 -04:00
Joey Hess
919a7d7316
sync: Fix double merge conflict resolution handling.
...
Ie, when there'a a conflicted merge we may get foo.variant-xxxx
created in a merge. If a second merge conflict occurs on that new file,
it was not falling back to putting in the whole key (which should stop
the merge conflicts happening for good, but is ugly).
2013-05-26 17:42:15 -04:00
Joey Hess
bd8f358e6d
typo
2013-05-26 17:12:03 -04:00
Joey Hess
f857c44b45
avoid redundant CanPush messages with different shas being queued up
2013-05-26 17:09:23 -04:00
Joey Hess
c3cf6bef34
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-26 16:16:24 -04:00
Joey Hess
469b3859fc
reduce the amount of subdirectories created by the fuzz tester to saner limit
2013-05-26 16:15:25 -04:00
Joey Hess
9978269b55
make fuzztest honor annex.diskreserve
2013-05-26 16:04:52 -04:00
Joey Hess
62c368dd7c
fix warning
2013-05-26 16:02:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
a729fe7401
2013-05-26 19:50:45 +00:00
Joey Hess
129be9cf68
more windows fixes
2013-05-26 11:12:34 -04:00
Joey Hess
b80d5494c4
typo
2013-05-26 11:08:18 -04:00
Joey Hess
1964bf4066
fix windows build
2013-05-26 11:05:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
fc6535ddd8
Added a comment
2013-05-26 13:50:31 +00:00
annexuser
847596e9c9
Added a comment
2013-05-25 22:58:16 +00:00
Joey Hess
fc37456d0f
fuzz test discovered a way automatic merge resultion can fail; fix
...
It may be that the directory we need to make a symlink in, to resolve the
merge, doesn't exist locally.
2013-05-25 18:42:43 -04:00
Joey Hess
33fe3dac9e
fuzz tester: avoid deleting entire repository (had to happen eventually, right?)
2013-05-25 18:15:34 -04:00
Joey Hess
377bc7bbb7
fix
2013-05-25 17:55:31 -04:00
Joey Hess
ce0ee2aa44
fuzz improvements
2013-05-25 17:52:33 -04:00
Joey Hess
2c5175b81f
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-25 17:19:32 -04:00
Joey Hess
4dc61d74c9
tune frequencies to avoid enormous trees being created
2013-05-25 17:18:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o
44b0039e6e
Added a comment
2013-05-25 20:27:32 +00:00
Joey Hess
90069a32c2
blog for the days
2013-05-25 16:08:29 -04:00
Joey Hess
8b5b4522d1
make fuzz test also output its actions to stdout
2013-05-25 15:52:28 -04:00
Joey Hess
564350ff90
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-25 15:24:35 -04:00
Joey Hess
3b1aedea3d
Merge branch 'robustness'
2013-05-25 15:22:18 -04:00
Joey Hess
5eeea0fac9
make direct mode merge cleanup more robust
...
If the cleanup of a single file fails for some reason, continue
to clean up other files.
This could happen because of a race. The merge pulls in a change to a file,
which gets changed locally at the same time.
2013-05-25 15:22:16 -04:00
Joey Hess
bf86b5ca16
improve robustness of fromDirect and replaceFile
...
Made fromDirect check that a file in the tree has good content (and is not
a broken symlink either) before copying it to another file that has the
same key.
Made replaceFile clean up the temp file if the action that creates it, or
the file replacement action fails.
2013-05-25 15:06:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
d36aa25b8f
Added a comment
2013-05-25 19:01:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs
7298f95a76
Added a step I had to do on my own OS X machine with 10.6 in order for the build to work.
2013-05-25 18:36:37 +00:00
Joey Hess
c8a749499d
Merge branch 'master' of ssh://git-annex.branchable.com
2013-05-25 13:59:37 -04:00
http://joeyh.name/
9d8ce10ee3
Added a comment
2013-05-25 17:57:43 +00:00
Joey Hess
09edbd5df2
some basic tests of preferred content expressions and standard groups
2013-05-25 13:51:36 -04:00
Joey Hess
baf36cb0cc
forgot to add
2013-05-25 13:51:27 -04:00
Joey Hess
d4234b461b
fix handling of Not in the matcher
2013-05-25 13:50:27 -04:00
Joey Hess
b276857a7a
content: New command line way to view and configure a repository's preferred content settings.
2013-05-25 12:44:58 -04:00
