summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 14:55:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 14:57:20 -0400
commitc36a1e34efd0e3144acee6fee96e3ea63aa65295 (patch)
treedc45095e9b5b472993104c28a69c7a1cdd6c071a
parentc02762882f52c632df00c92b35dac2cb4dfd85db (diff)
bug
-rw-r--r--doc/bugs/sync_uses_conflicting_names_for_deep_branches.mdwn6
-rw-r--r--doc/sync/comment_21_9c0368eb796f1191c22c186cbb06c642._comment10
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/sync_uses_conflicting_names_for_deep_branches.mdwn b/doc/bugs/sync_uses_conflicting_names_for_deep_branches.mdwn
new file mode 100644
index 000000000..fa6dd0d45
--- /dev/null
+++ b/doc/bugs/sync_uses_conflicting_names_for_deep_branches.mdwn
@@ -0,0 +1,6 @@
+`git annex sync` uses a branch named "synced/foo" to sync
+changes to branch named "foo", but that same name is used to sync
+changes to a branch named "bar/foo".
+
+Also, the adjusted branch code uses "adjusted/foo(unlocked)" for
+both "foo" and "bar/foo".
diff --git a/doc/sync/comment_21_9c0368eb796f1191c22c186cbb06c642._comment b/doc/sync/comment_21_9c0368eb796f1191c22c186cbb06c642._comment
new file mode 100644
index 000000000..bd40a8a8c
--- /dev/null
+++ b/doc/sync/comment_21_9c0368eb796f1191c22c186cbb06c642._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""Re: Branch names containing slashes"""
+ date="2016-09-21T18:56:22Z"
+ content="""
+@kartynnik, that's a bug: [[bugs/sync_uses_conflicting_names_for_deep_branches]]
+
+Please file bugs there and not as comments here, it's too easy to lose
+track of a comment deep in a thread.
+"""]]