aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-09 14:59:08 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-09 14:59:08 -0400
commite2548c18e147b00c387082c678454bfd9e6891b5 (patch)
tree26880b9f6aae0bd681ba64a3ccfbf433fa67a1a1
parent664ebd06d1ede56d336d1e0a5b007fb9daf10b41 (diff)
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.
-rw-r--r--debian/changelog6
-rw-r--r--doc/forum/Adding_a_mounted_network/comment_2_ae3d4ac918ef002ead859ed0c962ae32._comment14
2 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8b228f156..b53d77ac0 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 000000000..eaf066558
--- /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.
+"""]]