summaryrefslogtreecommitdiff
path: root/doc/bugs/failed_sync_with_direct_mode_repo
diff options
context:
space:
mode:
authorGravatar http://joeyh.name/ <http://joeyh.name/@web>2014-06-16 15:10:42 +0000
committerGravatar admin <admin@branchable.com>2014-06-16 15:10:42 +0000
commit8696bad9446ab821596f4c2eb1290fe76d35d504 (patch)
tree8537d56b9884788b5bc5285ed1cae51246012d88 /doc/bugs/failed_sync_with_direct_mode_repo
parent9cdaf8251bac6768852bf1424f813d62a26bc270 (diff)
Added a comment
Diffstat (limited to 'doc/bugs/failed_sync_with_direct_mode_repo')
-rw-r--r--doc/bugs/failed_sync_with_direct_mode_repo/comment_1_fb4026cc81eb0ec1e656e4a81ffacc4f._comment13
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/bugs/failed_sync_with_direct_mode_repo/comment_1_fb4026cc81eb0ec1e656e4a81ffacc4f._comment b/doc/bugs/failed_sync_with_direct_mode_repo/comment_1_fb4026cc81eb0ec1e656e4a81ffacc4f._comment
new file mode 100644
index 000000000..8b75fa67c
--- /dev/null
+++ b/doc/bugs/failed_sync_with_direct_mode_repo/comment_1_fb4026cc81eb0ec1e656e4a81ffacc4f._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-06-16T15:10:42Z"
+ content="""
+Reproduced this as described.
+
+Only happens when using the assistant in the second repository, which is a ssh remote of the first, and when there is not also a remote going the other way (so does not affect pairing).
+
+As I thought, the problem is that the master branch is not updated by the assistant when in direct mode, and while annex/direct/master is pulled by the other assistant, it does not merge it.
+
+"""]]