# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1336748338 -3600
# Node ID 5bf2b9fac68323a1d7f5e2974e2188f6a33f695e
# Parent  154205fd9f8b57c6e409a1e1b119f758b85ebad8# Parent  ad295b270cd42713e0bdc68ae65a6962a4b953d5
merge from live

diff -r 154205fd9f8b -r 5bf2b9fac683 lib/redmine/scm/adapters/abstract_adapter.rb
--- a/lib/redmine/scm/adapters/abstract_adapter.rb	Thu Feb 02 17:06:23 2012 +0000
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb	Fri May 11 15:58:58 2012 +0100
@@ -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