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 2013-11-01 11:10:21 -04:00
commit 5bc4a5f811
11 changed files with 125 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/backends/comment_5_2210c7ff2d5812fb3b778ac172291656._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmWBvsZvSsAL8P2ye3F0OBStjFCVnOImzM"
nickname="Jarno"
subject="Non-E backend drawbacks?"
date="2013-10-30T21:25:00Z"
content="""
The page states \"[non-E backends] can confuse some programs\". I like the ideal simplicity and recoverability of pure checksum backends but \"confusion\" sounds a bit worrying. Any practical examples of these problems to help me choose?
"""]]

8
doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_593a49669e2fadfb91773f8c84fbb031._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
nickname="Carlo"
subject="comment 6"
date="2013-10-31T10:03:01Z"
content="""
Of course, the autorecovery wouldn't affect the daemon.log from the work machine... so here they are: http://capocasa.name/work-desktop-ubuntu-12.04-daemonlog.tgz
"""]]

15
doc/bugs/During_synchronisation_top-level_folder_suddenly_appear_in_sub-sub-folder/comment_2_32e360cd7b100ddb9a526e7833fc55e1._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnh6wz0pMA3NLPFg2j_I3S5JeinaOVqnng"
nickname="Felix"
subject="comment 2"
date="2013-10-30T22:55:36Z"
content="""
It's quite possible that I have started the assistant (on the armhf machine) or the webapp (on the amd64 machine) in one of the subfolders, so yes it looks like that specific bug hit me.
Having looked at the logs, I'm pretty sure that the removal of the original directory was caused by removing the suddenly occuring \"mirror\" folders in a subdirectory.
***
Reverting proves to be difficult. I created a full copy of the git-annex repo and switched to indirect mode. There are around 500 commits that need to be reverted and about 6 of them are merges which I haven't been able to revert. I have only reverted the non-merge commits and after going back to direct mode there are now around 200 broken symlinks. I'm now assuming that those 200 are the ones that are lost and I need to restore from a backup. Can I rely on that? It's extremely difficult for me to do a full check.
***
How should I proceed to get this repo (after further repairs) again in sync with the second repo and have the second repo adopt the \"repaired\" state?
"""]]

8
doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_4_33ba2c890c962a71ae9fadc417359f8e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
nickname="Tim"
subject="comment 4"
date="2013-10-31T19:44:34Z"
content="""
Has this issue been fixed? I checked out the repository today and compiled with cabal, but I don't see a f.variant-A and a f.variant-B pop up after sync.
"""]]

10
doc/bugs/microsd__47__thumbdrives_seem_to_die_when_using_the_ARM_build/comment_1_0527581ea60d28bb28504fa2a355ed87._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
nickname="Carlo"
subject="salvaged logs"
date="2013-10-31T10:00:40Z"
content="""
The previously corrupt memory drive magically reappeared, so this might indicate a phone bug. In any case, I was able to salvage the logs from the phone.
[Salvaged Logs](http://capocasa.name/android-4.2-lenovo-daemonlog.tar.gz)
"""]]

8
doc/design/assistant/blog/day_224__annex.largefiles/comment_2_b24d1da2bc4307ded0216daffb8f9336._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmWBvsZvSsAL8P2ye3F0OBStjFCVnOImzM"
nickname="Jarno"
subject="Making "git-annex add" commit largefiles, too?"
date="2013-10-31T00:26:21Z"
content="""
Is it possible to make `git annex add` also *not* skip largefiles but do an automatic `git add` instead? I'd like to keep .txt, .sh and the like in git directly (for easier diffing) but having to add them separately sounds like trouble.
"""]]

15
doc/forum/GPG_passphrase_handling/comment_1_11ba130e8bea6698858d0a1a5b01830f._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
nickname="dxtrish"
subject="comment 1"
date="2013-10-31T00:06:22Z"
content="""
In fact I just tried this with a key without a passphrase and I STILL get:
[2013-10-31 01:00:50 CET] Pusher: Syncing with rsync.net
gpg: no valid addressees
gpg: [stdin]: encryption failed: no such user id
In addition I also noticed a lot of:
git-annex: fd:28: hPutBuf: resource vanished (Broken pipe)
"""]]

15
doc/forum/GPG_passphrase_handling/comment_2_ef9d58d15b7bbe0b3c7140bb01d73a31._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw"
nickname="dxtrish"
subject="comment 2"
date="2013-10-31T02:42:47Z"
content="""
I think I have found two ways I can make this happen.
1) If a filename contains UTF-8 it seems to happen (At least with this specific filename I have right here)
2) Finder.app does not seem to play nice with git-annex (I got the same error when I tried using Finder to copy files to my git-annex thing)
"""]]

18
doc/forum/Using_git_annex_with_Android_tablet_which_only_has_exFAT_and_no_symlinks/comment_2_1334a8d9f4bb60f3bf3ebabc656d98d9._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="Mebus"
ip="2001:4dd0:ff00:29::2"
subject="comment 2"
date="2013-10-31T23:39:42Z"
content="""
Hallo,
I tried it again.
On the Android tablet I get many files, which have got a size of 200 Bytes. And they should at least be a view kB.
Why?
Mebus
"""]]

8
doc/install/cabal/comment_25_8a7664e6f9271718dc607a0782366c5b._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="RaspberryPie"
ip="141.138.141.208"
subject="Bad version on Hackage"
date="2013-10-30T18:56:25Z"
content="""
Quick note: The latest version in the Hackage repository (git-annex-4.20131024) fails to build, due to a faulty version of Assistant/Threads/Cronner.hs.
"""]]

12
doc/tips/comment_1_f0feee9a16dc0199b44e6fe19aeaaef2._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawk453qKaMNy-mpyVoxOs02CHCIIVFOT9l0"
nickname="Matteo"
subject="git-annex in debian 7.2"
date="2013-11-01T11:27:48Z"
content="""
Hi guys,
I installed git-annex but I'm not able to run it as shown in the video walkthrough.
Some problem around that I missed?
Thanks all
"""]]