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-19 13:44:49 -04:00
commit ee8b495433
5 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
doc/bugs/Assistant_redirects_to_127.0.0.1_in_some_cases__44___although_used_remotely.mdwn Normal file
View file

@ -0,0 +1,26 @@
### Please describe the problem.
When I use git-annex webapp with a remote IP of a headless computer,
I am sometimes redirected to a 127.0.0.1 address (with a different
port as well)
### What steps will reproduce the problem?
1. Install git-annex as usual.
2. Open git-annex assistant from a headless machine and access the
webapp with the --listen option. (e.g. git annex webapp
--listen=xxx.yyy.zzz.www)
3. Create your first local repository. Then create a second local
repository.
4. When assistant asks you if you want to merge these 2
repositories, try to select the second option (to keep them
separated).
5. You are redirected from your remote IP to 127.0.0.1 to a new port number.
(I also encountered the same error at another menu or function, but
I don't remember where. Sorry.)
### What version of git-annex are you using? On what operating system?
4.20130815
Ubuntu 13.10 64-bit (kernel 3.11.0-13-generic x86_64)
### Please provide any additional information below.
Please ask me for any additional information that may be useful.

15
doc/bugs/Corrupted_drive:_Assistant_seems_consider_files_deleted_and_deletes_them_elsewhere_too/comment_6_5a348c5f327f16e1192ef6bd7f2880bb._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
nickname="Carlo"
subject="comment 6"
date="2013-11-19T09:48:26Z"
content="""
Sorry, missed the comment.
My work repo is the repository on my work laptop, where deletions got synced to.
Git annex had then run repository repair automatically, so the odd symlinks where no longer there for me to check out.
It is possible that I ran some git commands in direct mode I shouldn't have; I put the files back in and it's working nicely now. So this might have been a \"no direct mode guard\" issue.
"""]]

8
doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_13_571cffc0beb8ba5fc936db6971cd3d62._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="David"
ip="178.21.48.117"
subject="comment 13"
date="2013-11-19T09:17:26Z"
content="""
Please tell me if/how I can help you. For example if you need access to servers to test...
"""]]

2
doc/sync.mdwn
View file

@ -7,7 +7,7 @@ That works fine, if you don't mind having a central repository.
But it can be harder to use git in a fully decentralized fashion, with no
central repository and still keep repositories in sync with one another.
You have to remember to pull from each remote, and merge the appopriate
You have to remember to pull from each remote, and merge the appropriate
branch after pulling. It's difficult to *push* to a remote, since git does
not allow pushes into the currently checked out branch.

4
doc/todo/wishlist:_incremental_unannex___40__currently_requires_twice_the_size_of_repo_to_complete__41__.mdwn Normal file
View file

@ -0,0 +1,4 @@
I recently tried to use unannex for a large repo and it failed because the repo size was more than half the disk size. Unannex should work incrementally so this isn't a problem.
Proposed solution:
copy a file, hash it, iff hash check is okay, delete from objects, continue to next file