[hgsvn] Add patch to fix remove issue (bz #963320)

[terjeros]

commit edfdf1861d04b16d4557e7b75d475d7be075674f
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Jun 10 15:28:03 2013 +0200

    Add patch to fix remove issue (bz #963320)

 hgsvn-0.1.9-remove-fix.patch |   12 ++++++++++++
 hgsvn.spec                   |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/hgsvn-0.1.9-remove-fix.patch b/hgsvn-0.1.9-remove-fix.patch
new file mode 100644
index 0000000..481b1df
--- /dev/null
+++ b/hgsvn-0.1.9-remove-fix.patch
@@ -0,0 +1,12 @@
+--- a/hgsvn/run/hgpullsvn.py
++++ b/hgsvn/run/hgpullsvn.py
+@@ -174,8 +174,7 @@
+             if removed_paths:
+                 try: 
+                     for file_path in removed_paths:
+-                       if os.path.exists(file_path):
+-                           run_hg(["remove", "-A"], file_path)
++                       run_hg(["remove", "-A"], [file_path])
+                 except (ExternalCommandFailed), e:
+                     if str(e).find("file is untracked") > 0:
+                         ui.status("Ignoring warnings about untracked files: '%s'" % str(e), level=ui.VERBOSE)
diff --git a/hgsvn.spec b/hgsvn.spec
index b3921d9..1793d46 100644
--- a/hgsvn.spec
+++ b/hgsvn.spec
@@ -4,13 +4,14 @@
 Summary:       A set of scripts to work locally on subversion checkouts using mercurial
 Name:          hgsvn
 Version:       0.1.9
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv3+
 Group:         Development/Tools
 URL:           http://pypi.python.org/pypi/hgsvn/
 Source0:       http://pypi.python.org/packages/source/h/%{name}/%{name}-%{version}.tar.gz
 Patch0:        hgsvn-0.1.9-disable-ez.patch
 Patch1:        hgsvn-0.1.9-subversion-1.7.patch
+Patch2:        hgsvn-0.1.9-remove-fix.patch
 BuildArch:     noarch
 Requires:      mercurial >= 1.4.3
 Requires:      subversion
@@ -36,6 +37,7 @@ fast local operations like hg log and hg annotate.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
@@ -60,6 +62,9 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 %{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info
 
 %changelog
+* Mon Jun 10 2013 Terje Rosten <terje.rosten at ntnu.no> - 0.1.9-5
+- Add patch to fix remove issue (bz #963320)
+
 * Sun Feb 24 2013 Terje Rosten <terje.rosten at ntnu.no> - 0.1.9-4
 - Add patch to fix subversion 1.7 issue