Merge branch 'master' of ssh://git-annex.branchable.com

3 files changed, 115 insertions, 0 deletions

diff --git a/doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found.mdwn b/doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found.mdwn
new file mode 100644
index 000000000..1cafcf6d5
--- /dev/null
+++ b/doc/bugs/debian__47__rules_clean_fails_with_with_cabal_not_found.mdwn
@@ -0,0 +1,65 @@
+### Please describe the problem.
+
+Adding BUILDER=stack support in 441573a9 breaks building debian based packages.
+
+### What steps will reproduce the problem?
+
+[[!format sh """
+$ debian/rules clean
+dh clean
+   dh_testdir
+   dh_auto_clean
+        make -j1 clean
+make[1]: Entering directory '/home/jtgeibel/repos/launchpad.net/git-annex'
+debian/cabal-wrapper clean
+debian/cabal-wrapper: 14: debian/cabal-wrapper: cabal: not found
+Makefile:101: recipe for target 'clean' failed
+make[1]: *** [clean] Error 127
+make[1]: Leaving directory '/home/jtgeibel/repos/launchpad.net/git-annex'
+dh_auto_clean: make -j1 clean returned exit code 2
+debian/rules:12: recipe for target 'clean' failed
+make: *** [clean] Error 2
+"""]]
+
+### What version of git-annex are you using? On what operating system?
+
+6.20160114 (Ubuntu wily & trusty)
+
+### Please provide any additional information below.
+
+I've patched this locally as follows.  In the Makefile I've assumed that both cabal and stack support a clean command.
+
+[[!format patch """
+diff --git a/Makefile b/Makefile                                                                                                                              
+index 342152c..977855a 100644                                                                                                                                               
+--- a/Makefile                                                                                                                                                              
++++ b/Makefile                                                                                                                                                              
+@@ -98,7 +98,7 @@ docs: mans                                                                                                                                                                 
+                --exclude='users/*' --exclude='devblog/*' --exclude='thanks'                                                                                                                 
+                                                                                                                                                                                             
+ clean:                                                                                                                                                                                      
+-       $(BUILDER) clean                                                                                                                                                                     
++       if [ "$(BUILDER)" != ./Setup ]; then $(BUILDER) clean; fi                                                                                                                            
+        rm -rf tmp dist git-annex $(mans) configure  *.tix .hpc \                                                                                                                            
+                doc/.ikiwiki html dist tags Build/SysConfig.hs \                                                                                                                             
+                Setup Build/InstallDesktopFile Build/EvilSplicer \                                                                                                                                                
+diff --git a/debian/rules b/debian/rules
+index e6ee592..3345fee 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -1,6 +1,6 @@
+ #!/usr/bin/make -f
+ 
+-export BUILDER=debian/cabal-wrapper
++export BUILDER=./Setup
+ 
+ STANDALONE_BUILD=$(shell grep -qe '^Package: git-annex-standalone' debian/control \
+                          && echo 1 || echo 0)
+"""]]
+
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+git-annex has been a great way for me to explore both Haskell and software packaging.
+
+I enjoyed the interview on LWN.
diff --git a/doc/forum/How_can_I_recover_from_misadventure__63__/comment_2_94f5435529802ea9d1980ee07025c6eb._comment b/doc/forum/How_can_I_recover_from_misadventure__63__/comment_2_94f5435529802ea9d1980ee07025c6eb._comment
new file mode 100644
index 000000000..dede1fc7a
--- /dev/null
+++ b/doc/forum/How_can_I_recover_from_misadventure__63__/comment_2_94f5435529802ea9d1980ee07025c6eb._comment
@@ -0,0 +1,36 @@
+[[!comment format=mdwn
+ username="hiredman@b5864f8a30c0cafbc990313b56c39586ca7a21ec"
+ nickname="hiredman"
+ subject="comment 2"
+ date="2016-01-19T23:11:25Z"
+ content="""
+```
+$ git annex version
+git-annex version: 5.20151218-g5008846
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3(multipartupload) WebDAV Inotify DBus DesktopNotify XMPP ConcurrentOutput DNS Feeds Quvi TDFA TorrentParser Database
+key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL  
+remote types: git gcrypt S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+$ lsb_release -a
+No LSB modules are available.
+Distributor ID: Ubuntu
+Description:    Ubuntu 15.04
+Release:        15.04
+Codename:       vivid  
+$ uname -a
+Linux aktaios 4.2.0-040200rc2-generic #201507160938 SMP Thu Jul 16 09:49:19 UTC 2015 i686 i686 i686 GNU/Linux
+```
+
+The commands would exit successfully.
+
+
+I realize now that if I wanted to start from scratch the correct thing to do is likely 'git annex uninit' so I am running that now, but it fails often with an error like:
+
+```
+git-annex: Users/hiredman/.gem/specs/rubygems.org%80/quick/Marshal.4.8/bundler-1.0.15.gemspec points to annexed content, but is not checked into git.
+Perhaps this was left behind by an interrupted git annex add?
+Not continuing with uninit; either delete or git annex add the file and retry.
+```
+
+So I wrote in little shell loop to run 'git annex uninit', replace symlink with the contents out of .git/, and run 'git annex uinit' again. This is going slowly and seems to be getting slower, so I guess uninit does some kind of scan of all the files that is interrupted every time it hits the above error, and has to be done again from scratch every time, so as I remove those errors one by one uninit takes longer and longer to hit the next error. So what I need to do is write a script to fix the links up in a single scan. 
+
+"""]]
diff --git a/doc/forum/Use_reflinks_on_BTRFS_instead_of_symlinks___63__/comment_3_83dc719be1883d5369d27a787a5b5705._comment b/doc/forum/Use_reflinks_on_BTRFS_instead_of_symlinks___63__/comment_3_83dc719be1883d5369d27a787a5b5705._comment
new file mode 100644
index 000000000..f5c132449
--- /dev/null
+++ b/doc/forum/Use_reflinks_on_BTRFS_instead_of_symlinks___63__/comment_3_83dc719be1883d5369d27a787a5b5705._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="sylvain.joyeux@5c33d7abae4df5f574fc4b8791d02054d245bf62"
+ nickname="sylvain.joyeux"
+ subject="not on the directory special remote"
+ date="2016-01-20T11:39:35Z"
+ content="""
+I'm trying to share videos across my (many) presentations using annex. My idea was to have a local annex directory remote that is used by all the presentation gits.
+
+However, it seems that copying from a directory special remote does not use reflink. Is that right ?
+
+Thanks for git-annex !
+
+Sylvain
+"""]]