# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1320180613 18000
# Node ID df2c854780632d2cb17a82aa557667df8af60dc5
# Parent  6c4d15d8cfbda880bf5e41cd408d49f8529f97d2# Parent  794f3e41ec1e41145251d53d69559d4819c199e1
Merge with stable

diff --git a/hgsubversion/editor.py b/hgsubversion/editor.py
--- a/hgsubversion/editor.py
+++ b/hgsubversion/editor.py
@@ -342,10 +342,13 @@ class HgEditor(svnwrap.Editor):
             try:
                 if not self.meta.is_path_valid(self.current.file):
                     return
+                # Already get and store the value here, because calling
+                # handler(window) seems to close the target in Subversion 1.7.
+                val = target.getvalue()
                 handler(window)
                 # window being None means commit this file
                 if not window:
-                    self.current.files[self.current.file] = target.getvalue()
+                    self.current.files[self.current.file] = val
             except svnwrap.SubversionException, e: # pragma: no cover
                 if e.args[1] == svnwrap.ERR_INCOMPLETE_DATA:
                     self.current.missing.add(self.current.file)