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

This commit is contained in:
Joey Hess 2013-06-18 16:52:44 -04:00
commit 6133811308
5 changed files with 59 additions and 2 deletions

View file

@ -0,0 +1,25 @@
### Please describe the problem.
I have some files that I want to drop from my laptop. However, as soon as I drop them (git-annex drop), the assistant starts to download them again from another repository. At first glance, this seems like a variant of [[bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time]].
I would expect that after an explicit drop command, the files would not be re-downloaded.
The repository that this is happening on is a "client" type, direct-mode repository.
### What steps will reproduce the problem?
git annex drop drop-test/TestFile.data
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130618-g333cb8e
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS
local repository version: 4
default repository version: 3
supported repository versions: 3 4
upgrade supported from repository versions: 0 1 2
I am running Ubuntu 13.04
### Please provide any additional information below.
log emailed.

View file

@ -0,0 +1,11 @@
### Please describe the problem.
(I assume) following your change to disallow changing the name of "here", I am unable to change the repository group of "here"
### What steps will reproduce the problem?
In webapp, edit "here", and try and change repository group.
It highlights the (now empty) name field, and says "value is required".
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130618-g333cb8e
Ubuntu 13.04

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
nickname="Joe"
subject="comment 9"
date="2013-06-18T09:58:41Z"
content="""
The regression appears to behere: $ git diff d80a0f62a4aa5a2a3566f29dd6bda619b1a7eabd..64f8819ae47cc27b164eb69aa846dfb0f7cc6ef3 Process.hs
I rewound each commit until I no longer had the regression. This commit was clean: d80a0f62a4aa5a2a3566f29dd6bda619b1a7eabd. Something with the changes to Process.hs is causing my error.
I validated by building using git checkout d80a0f62a4aa5a2a3566f29dd6bda619b1a7eabd Process.hs and the error went away.
"""]]

View file

@ -1,6 +1,7 @@
Yay, I fixed the
[[handling_of_files_inside_and_outside_archive_directory_at_the_same_time]] bug!
At least in difect mode, which thanks to its associated files tracking
[[bugs/Handling_of_files_inside_and_outside_archive_directory_at_the_same_time]]
bug!
At least in direct mode, which thanks to its associated files tracking
knows when a given file has another file in the repository with the same
content. Had not realized the behavior in direct mode was so bad, or the
fix so relatively easy. Pity I can't do the same for indirect mode, but

View file

@ -0,0 +1,8 @@
Hi,
I setup a first repository on local disk, it went fine. Next I tried setting up repo on my nas to clone the files. I installed git-annex on the NAS (it's armel arch) and created the repository via webapp, I entered the password once. Git-annex started syncing the remote repo and after few seconds password pop-up hell broke loose. I was flooded with password-prompt pop-up windows. The synchronization was continuing regardless of correctly/incorrectly entered passwords. What's more, these popups grab the keyboard and you cannot do (appropriate word) with your system.
I checked this topic: http://git-annex.branchable.com/forum/ssh_password/ and ssh config is in place on my computer and on the NAS.
What is causing this and how can I get rid of this?