From 60330325aa7e38844ef02251e850936902cd084f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 30 May 2014 12:31:54 -0400 Subject: webapp: Avoid stomping on existing group and preferred content settings when adding a local repository (or removable drive repository) that already exists. This does mean that if the webapp is asked to add a git repository on a removable drive that already exists, but is not yet a git-annex repository, it will avoid putting it in any group. That unlikely edge case is ok; the next step is the edit repository screen, which will show it's not in any group and the user can pick one. --- debian/changelog | 3 +++ ...adding_existing_repo_as_remote_in_webapp_may_reset_its_group.mdwn | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c1a7e3c03..3eb4cf09d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ git-annex (5.20140530) UNRELEASED; urgency=medium * webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining. + * webapp: Avoid stomping on existing group and preferred content settings + when adding a local repository (or removable drive repository) that + already exists. -- Joey Hess Thu, 29 May 2014 20:10:59 -0400 diff --git a/doc/bugs/adding_existing_repo_as_remote_in_webapp_may_reset_its_group.mdwn b/doc/bugs/adding_existing_repo_as_remote_in_webapp_may_reset_its_group.mdwn index 157296085..492adfe8b 100644 --- a/doc/bugs/adding_existing_repo_as_remote_in_webapp_may_reset_its_group.mdwn +++ b/doc/bugs/adding_existing_repo_as_remote_in_webapp_may_reset_its_group.mdwn @@ -5,4 +5,7 @@ settings. Adding existing local repositories or repositories from removable drives may have the same problems. Didn't check yet. -[[!ttag confirmed]] --[[Joey]] +[[!tag confirmed]] --[[Joey]] + +> Fixed for local repos and repos on removable drives. Still open for +> ssh remotes (incl gcrypt). --[[Joey]] -- cgit v1.2.3