diff options
| author |  EskildHustvedt <EskildHustvedt@web> | 2014-07-08 08:13:40 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-07-08 08:13:40 +0000 |
| commit | d75a866261ef0a0dd910ac0c87c7fb9cb7914a17 (patch) | |
| tree | 228d2b7c158f3ad1e9c78c613eeb38538250b37d /doc/bugs/Assistant_merge_loop | |
| parent | d2b8c8663b3c486c02e400534e777f9aff45d881 (diff) | |
Added a comment
Diffstat (limited to 'doc/bugs/Assistant_merge_loop')
| -rw-r--r-- | doc/bugs/Assistant_merge_loop/comment_3_07341221b2839fdc1c43634e011451d2._comment | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/doc/bugs/Assistant_merge_loop/comment_3_07341221b2839fdc1c43634e011451d2._comment b/doc/bugs/Assistant_merge_loop/comment_3_07341221b2839fdc1c43634e011451d2._comment new file mode 100644 index 000000000..1b6956483 --- /dev/null +++ b/doc/bugs/Assistant_merge_loop/comment_3_07341221b2839fdc1c43634e011451d2._comment @@ -0,0 +1,62 @@ +[[!comment format=mdwn + username="EskildHustvedt" + ip="80.202.103.55" + subject="comment 3" + date="2014-07-08T08:13:40Z" + content=""" +I'm still seeing this problem in 5.20140707-g923b436 + + [0 zerodogg@firefly annexed]$ git annex version + git-annex version: 5.20140707-g923b436 + 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 + [0 zerodogg@firefly annexed]$ git graph | head -n20 + * d4bf68f - (HEAD, annex/direct/master) merge refs/remotes/serenity/synced/master (3 minutes ago) <Eskild Hustvedt> + |\ + * | d03f280 - merge refs/remotes/browncoats/synced/master (3 minutes ago) <Eskild Hustvedt> + |/ + * e6863b8 - (serenity/synced/master, browncoats/synced/master) merge refs/remotes/serenity/synced/master (3 minutes ago) <Eskild Hustvedt> + |\ + * \ 616d985 - merge refs/remotes/browncoats/synced/master (3 minutes ago) <Eskild Hustvedt> + |\ \ + | |/ + * | 3b39706 - merge refs/remotes/serenity/synced/master (3 minutes ago) <Eskild Hustvedt> + |\ \ + | |/ + * | 6d354cc - merge refs/remotes/browncoats/synced/master (4 minutes ago) <Eskild Hustvedt> + |\ \ + | |/ + * | 710c3c1 - merge refs/remotes/serenity/synced/master (4 minutes ago) <Eskild Hustvedt> + |\ \ + | |/ + * | 763930f - merge refs/remotes/browncoats/synced/master (4 minutes ago) <Eskild Hustvedt> + |/ + [0 zerodogg@firefly annexed]$ git annex assistant --stop + [0 zerodogg@firefly annexed]$ git annex assistant + [0 zerodogg@firefly annexed]$ git graph | head -n20 + * 947f1a2 - (HEAD, annex/direct/master) merge refs/remotes/serenity/synced/master (15 seconds ago) <Eskild Hustvedt> + |\ + * | 19c6043 - merge refs/remotes/browncoats/synced/master (18 seconds ago) <Eskild Hustvedt> + |/ + * b453741 - (serenity/synced/master, browncoats/synced/master) merge refs/remotes/serenity/synced/master (18 seconds ago) <Eskild Hustvedt> + |\ + * \ 6baaebd - merge refs/remotes/browncoats/synced/master (18 seconds ago) <Eskild Hustvedt> + |\ \ + | |/ + * | 03e4fa2 - merge refs/remotes/serenity/synced/master (24 seconds ago) <Eskild Hustvedt> + |\ \ + | |/ + * | 33302d8 - merge refs/remotes/browncoats/synced/master (24 seconds ago) <Eskild Hustvedt> + |\ \ + | |/ + * | d4bf68f - merge refs/remotes/serenity/synced/master (4 minutes ago) <Eskild Hustvedt> + |\ \ + | |/ + * | d03f280 - merge refs/remotes/browncoats/synced/master (4 minutes ago) <Eskild Hustvedt> + |/ + [0 zerodogg@firefly annexed]$ +"""]] |