mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-07-14 14:37:48 -04:00
commit 2416ed18c4
6 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
doc/bugs/S3_upload_not_using_multipart/comment_2_d82952cf324e769e45f4d90f200210f4._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="annexuser"
ip="64.71.7.82"
subject="comment 2"
date="2014-07-14T18:21:00Z"
content="""
I'm having the same problem. Is there a fix for this yet?
$ git annex version
git-annex version: 5.20140709-gc75193e
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
"""]]

8
doc/forum/Android_version_does_not_sync/comment_2_4eafd3e989611f835c489b379bd6ec8a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 2"
date="2014-07-14T18:21:15Z"
content="""
How did you create this repository on the android device? Normally a git repository has an index file, unless it has just been manually created with `git init` and has not yet had anything added to it. When the webapp is used to create a repository, it should always leave it with an index file already present.
"""]]

8
doc/forum/Performance_implications_of_triply_nested_objects_directory/comment_1_068a8f120d188b8fa5d3e5b687fd02dc._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-14T18:33:25Z"
content="""
I'm afraid that you're comparing apples (SATA drives) and oranges (USB drives).
"""]]

10
doc/todo/Recovering_from_a_bad_sync/comment_1_6f5f518a3190534b737203787149ef3c._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 1"
date="2014-07-14T18:27:43Z"
content="""
If this is a todo item at all, it may make sense to make `git annex sync` sync even with git remotes that have no annex-uuid.
As far as solving the problem, I think you just need to sync more in order to get the full list of remotes propigated around to all the remotes. Sync automatically merges disconnected git histories no matter how they got that way or how long they have been disconnected or diverged.
"""]]

10
doc/todo/Recovering_from_a_bad_sync/comment_2_e494df56dcede4d14bcaa4cdbf3da4f5._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 2"
date="2014-07-14T18:38:58Z"
content="""
It seems that the person who filed this todo item also filed [[bugs/sync does not commit with alwasycommit = false]] and got pretty confused by that.
So, repurposing this todo item to be about perhaps syncing with remotes that have no annex-uuid by default.
"""]]

8
doc/todo/wishlist:_do_not_import_new_files/comment_2_7b26171458baaf5c0057276d2d97e14c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 2"
date="2014-07-14T18:30:38Z"
content="""
You can use --clean-duplicates unless your goal is for some reason to add the duplicate files to your repository a second time.
"""]]