# HG changeset patch
# User Chris Cannam
# Date 1331656447 0
# Node ID bd2afdf7e446fa6d8a1b873d8e16dc6bc166f789
# Parent  6e80a22916e94668524aa0c2c37b736355bddfac# Parent  ad295b270cd42713e0bdc68ae65a6962a4b953d5
Merge from branch "live"

diff -r 6e80a22916e9 -r bd2afdf7e446 lib/redmine/scm/adapters/abstract_adapter.rb
--- a/lib/redmine/scm/adapters/abstract_adapter.rb	Thu Feb 02 15:24:04 2012 +0000
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb	Tue Mar 13 16:34:07 2012 +0000
@@ -242,7 +242,12 @@
 
         def scm_iconv(to, from, str)
           return nil if str.nil?
-          return str if to == from
+          # bug 446: non-utf8 paths in repositories blow up repo viewer and reposman
+          # -- Remove this short-circuit: we want the conversion to
+          #    happen always, so we can trap the error here if the
+          #    source text happens not to be in the advertised
+          #    encoding (instead of having the database blow up later)
+#          return str if to == from
           begin
             Iconv.conv(to, from, str)
           rescue Iconv::Failure => err