Merge branch 'master' into assistant

8 files changed, 101 insertions, 0 deletions

diff --git a/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__.mdwn b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__.mdwn
new file mode 100644
index 000000000..862259422
--- /dev/null
+++ b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__.mdwn
@@ -0,0 +1,34 @@
+What steps will reproduce the problem?
+
+    alip@hayalet /tmp/aaa (git)-[master] % git annex init aaa
+    init aaa ok
+    (Recording state in git...)
+    alip@hayalet /tmp/aaa (git)-[master] % git remote add çüş /tmp/çüş
+    alip@hayalet /tmp/aaa (git)-[master] % git annex sync --debug
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","symbolic-ref","HEAD"]
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","show-ref","git-annex"]
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","show-ref","--hash","refs/heads/git-annex"]
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","log","refs/heads/git-annex..bc45cd9c2cb7c9b0c7a12a4c0210fe6a262abac9","--oneline","-n1"]
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","log","refs/heads/git-annex..9220bfedd1e13b2d791c918e2d59901af353825f","--oneline","-n1"]
+    (merging origin/git-annex into git-annex...)
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","cat-file","--batch"]
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","update-index","-z","--index-info"]
+    git ["--git-dir=/tmp/aaa/.git","--work-tree=/tmp/aaa","diff-index","--raw","-z","-r","--no-renames","-l0","--cached","9220bfedd1e13b2d791c918e2d59901af353825f"]
+    git-annex: Cannot decode byte '\xfc': Data.Text.Encoding.decodeUtf8: Invalid UTF-8 stream
+    1 alip@hayalet /tmp/aaa (git)-[master] % 
+
+What is the expected output? What do you see instead?
+
+Syncing a repository under a path with utf-8 characters in its name fails.
+
+What version of git-annex are you using? On what operating system?
+
+git-annex version: 3.20120624
+
+On Exherbo, linux-3.4
+
+Please provide any additional information below.
+
+'\xfc' is valid UTF-8: 'LATIN SMALL LETTER U WITH DIAERESIS'
+
+> closing as non-reproducible and presumably fixed. [[done]] --[[Joey]] 
diff --git a/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_1_f1a7352b04f395e06e0094c1f51b6fff._comment b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_1_f1a7352b04f395e06e0094c1f51b6fff._comment
new file mode 100644
index 000000000..28faa7b45
--- /dev/null
+++ b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_1_f1a7352b04f395e06e0094c1f51b6fff._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.2.25"
+ subject="comment 1"
+ date="2012-06-27T02:48:31Z"
+ content="""
+I don't think this has to do with the path name of the repository containing utf-8 at all.
+
+Your recipe for reproducing this depends on some pre-existing repository that I don't know how to set up to reproduce this bug. All I can guess is that, based on the \"decodeUtf8\" in the error message, it's coming from the one part of the code that still uses that, the union merger.
+
+
+"""]]
diff --git a/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_2_c1890067079cd99667f31cbb4d2e4545._comment b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_2_c1890067079cd99667f31cbb4d2e4545._comment
new file mode 100644
index 000000000..3486be733
--- /dev/null
+++ b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_2_c1890067079cd99667f31cbb4d2e4545._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.2.25"
+ subject="comment 2"
+ date="2012-06-27T03:08:13Z"
+ content="""
+Since I can't reproduce it I am not sure, but it may be fixed by the commits I've just made.
+"""]]
diff --git a/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_3_213c96085c60c8e52cd803df07240158._comment b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_3_213c96085c60c8e52cd803df07240158._comment
new file mode 100644
index 000000000..48a382029
--- /dev/null
+++ b/doc/bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/comment_3_213c96085c60c8e52cd803df07240158._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg"
+ nickname="Ali"
+ subject="comment 3"
+ date="2012-06-27T12:56:37Z"
+ content="""
+Yes, the problem is fixed.
+
+The repository was a normal git repository with path /tmp/çüş (git init)
+and with annex description \"çüş\" (git annex init çüş)
+
+afaict, i can't reproduce the problem anymore either :-)
+"""]]
diff --git a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files.mdwn b/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files.mdwn
new file mode 100644
index 000000000..7bdd93654
--- /dev/null
+++ b/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files.mdwn
@@ -0,0 +1,10 @@
+I'm not sure if this _feature_ exists already wrapped or provided as a recipe for users or not yet. But it would be nice to be able to do a
+
+    git annex du [PATH]
+
+Such that the output that git annex would return is the total disk used locally in the PATH and the theoretical disk used by the PATH if it was fully populated locally. e.g.
+
+    $ git annex du FSL0001_ANALYSIS
+    $ Local: 1000kb, Annex: 2000kb
+
+or something along the lines of that?
diff --git a/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment b/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment
new file mode 100644
index 000000000..bff5b2ea7
--- /dev/null
+++ b/doc/forum/Wishlist:_getting_the_disk_used_by_a_subtree_of_files/comment_1_7abb1155081a23ce4829ee69b2064541._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.153.2.25"
+ subject="comment 1"
+ date="2012-06-27T12:36:08Z"
+ content="""
+Use `du -L` for the disk space used locally. The other number is not currently available, but it would be nice to have. I also sometimes would like to have data on which backends are used how much, so making this `git annex status --subdir` is tempting. Unfortunatly, it's current implementation scans `.git/annex/objects`
+and not the disk tree (better for accurate numbers due to copies), so it would not be a very easy thing to add. Not massively hard, but not something I can pound out before I start work today..
+"""]]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 965a07f0d..85a5a18f0 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -135,6 +135,11 @@ subdirectories).
   commands to do each of those steps by hand, or if you don't want to
   worry about the details, you can use sync.
 
+  Merge conflicts are automatically resolved by sync. When two conflicting
+  versions of a file have been committed, both will be added to the tree,
+  under different filenames. For example, file "foo" would be replaced
+  with "foo.somekey" and "foo.otherkey".
+
   Note that syncing with a remote will not update the remote's working
   tree with changes made to the local repository. However, those changes
   are pushed to the remote, so can be merged into its working tree
diff --git a/doc/install/OSX/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment b/doc/install/OSX/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment
new file mode 100644
index 000000000..69a4f9128
--- /dev/null
+++ b/doc/install/OSX/comment_11_707a1a27a15b2de8dfc8d1a30420ab4c._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE"
+ nickname="Agustin"
+ subject="comment 11"
+ date="2012-06-27T08:54:52Z"
+ content="""
+Hi @joey! Perfect!... I'll do that then!
+
+Thanks for your time man!
+"""]]