From 2736c59204672d174d358691ebb8d00ebe9c4dba Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 9 Apr 2015 14:59:08 -0400
Subject: [PATCH] fix webapp reversion caused by relative path changes

webapp: When adding another local repository, and combining it with the
current repository, the new repository's remote path was set to "." rather
than the path to the current repository. This was a reversion caused by the
relative path changes in 5.20150113.
---
 Assistant/WebApp/Configurators/Local.hs            |  5 +++--
 debian/changelog                                   |  6 +++++-
 ...ent_2_ae3d4ac918ef002ead859ed0c962ae32._comment | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 doc/forum/Adding_a_mounted_network/comment_2_ae3d4ac918ef002ead859ed0c962ae32._comment

diff --git a/Assistant/WebApp/Configurators/Local.hs b/Assistant/WebApp/Configurators/Local.hs
index abfadc7254..30fc0cab01 100644
--- a/Assistant/WebApp/Configurators/Local.hs
+++ b/Assistant/WebApp/Configurators/Local.hs
@@ -347,8 +347,9 @@ getFinishAddDriveR drive = go
 combineRepos :: FilePath -> String -> Handler Remote
 combineRepos dir name = liftAnnex $ do
 	hostname <- fromMaybe "host" <$> liftIO getHostname
-	hostlocation <- fromRepo Git.repoLocation
-	liftIO $ inDir dir $ void $ makeGitRemote hostname hostlocation
+	mylocation <- fromRepo Git.repoLocation
+	mypath <- liftIO $ relPathDirToFile dir mylocation
+	liftIO $ inDir dir $ void $ makeGitRemote hostname mypath
 	addRemote $ makeGitRemote name dir
 
 getEnableDirectoryR :: UUID -> Handler Html
diff --git a/debian/changelog b/debian/changelog
index 8b228f1561..b53d77ac08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-git-annex (5.20150406.2) UNRELEASED; urgency=medium
+git-annex (5.20150409) UNRELEASED; urgency=medium
 
   * This fixes a bug in the assistant introduced by the literal pathspec
     changes in version 5.20150406.
@@ -16,6 +16,10 @@ git-annex (5.20150406.2) UNRELEASED; urgency=medium
     repo.
   * importfeed: Fix feed download when curl is used.
   * importfeed: Error out when passed a non-url.
+  * webapp: When adding another local repository, and combining it
+    with the current repository, the new repository's remote path
+    was set to "." rather than the path to the current repository.
+    This was a reversion caused by the relative path changes in 5.20150113.
 
  -- Joey Hess <id@joeyh.name>  Mon, 06 Apr 2015 20:14:20 -0400
 
diff --git a/doc/forum/Adding_a_mounted_network/comment_2_ae3d4ac918ef002ead859ed0c962ae32._comment b/doc/forum/Adding_a_mounted_network/comment_2_ae3d4ac918ef002ead859ed0c962ae32._comment
new file mode 100644
index 0000000000..eaf0665581
--- /dev/null
+++ b/doc/forum/Adding_a_mounted_network/comment_2_ae3d4ac918ef002ead859ed0c962ae32._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2015-04-09T18:33:47Z"
+ content="""
+If you want to do with using the webapp, go to the "Repository"
+menu in the upper-left, and select "Add another local repository."
+
+You can then enter the path to your repository, whevever it is, 
+and click on "combine the repositories"
+
+But, like Justin said, this just sets up a git remote, so doing it at
+the command line will work just as well.
+"""]]