summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar EskildHustvedt <EskildHustvedt@web>2014-07-05 05:15:58 +0000
committerGravatar admin <admin@branchable.com>2014-07-05 05:15:58 +0000
commit0d1d5059afa09b16077cf4e02f14e68ad2da3a43 (patch)
treef575b4d337bf8c95b406a3bcbc4df6357cae6ec5
parentc127a725a1c7b62c7a3c20c3d8257c44ddc4f42f (diff)
-rw-r--r--doc/bugs/Assistant_merge_loop.mdwn16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_merge_loop.mdwn b/doc/bugs/Assistant_merge_loop.mdwn
new file mode 100644
index 000000000..d0d710866
--- /dev/null
+++ b/doc/bugs/Assistant_merge_loop.mdwn
@@ -0,0 +1,16 @@
+The assistant appears to be in a merge loop with at least two of my repos. It's creating thousands of merge commits without any changes. One repository that contains around 600 files that change very very rarely now has 63528 commits.
+
+Here's a screenshot from tig: [[https://ssl.zerodogg.org/~zerodogg/private/tmp/Skjermdump_fra_2014-07-05_07:09:22-2014-07-05.png]]
+
+I can privately provide a copy of the git repo itself if needed.
+
+Using the standalone build, 64bit, on ArchLinux, Fedora 20 and Ubuntu 14.04.
+
+ $ git annex version
+ git-annex version: 5.20140610-g5ec8bcf
+ build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
+ key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+ remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
+ local repository version: 5
+ supported repository version: 5
+ upgrade supported from repository versions: 0 1 2 4