From 80667da3a5cdf242a5e6f69bfd8f3fb29f56142a Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Wed, 1 Jul 2020 19:51:53 -0400 Subject: [PATCH] Fix error when using '-m' in an SVN repo --- CHANGELOG.md | 1 + src/usr/bin/diffuse | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2afcc1e..9dfe8d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - fixed missing directories when uninstalling - fixed bug introduced by r420 with RCS VCS - fixed broken drag'n'drop since migration to Python3/GTK3 +- fixed error when using '-m' in an SVN repo ## [0.4.8] - 2014-07-18 ### Added diff --git a/src/usr/bin/diffuse b/src/usr/bin/diffuse index cc56540..eacaab7 100755 --- a/src/usr/bin/diffuse +++ b/src/usr/bin/diffuse @@ -1334,7 +1334,6 @@ def relpath(a, b): # by prepending './' to the basename def safeRelativePath(abspath1, name, prefs, cygwin_pref): s = os.path.join(os.curdir, relpath(abspath1, os.path.abspath(name))) - s = codecs.encode(s, sys.getfilesystemencoding()) if isWindows(): if prefs.getBool(cygwin_pref): s = s.replace('\\', '/')