[Svnmerge] Issue 3494: moving a branch stumps svnmerge

[David Brooks]

Hi,

I've just had a similar issue that I have solved with the following:

--- svnmerge.py    (revision 1032794)
+++ svnmerge.py    (working copy)
@@ -1351,8 +1351,8 @@
          cf_pathid = None
          if cf_source:
              cf_url = get_repo_root(source_url) + cf_source
-            if is_url(cf_url) and check_url(cf_url):
-                cf_pathid = PathIdentifier.from_target(cf_url)
+            if is_url(cf_url) and check_url('%s@%s' % (cf_url, cf_rev)):
+                cf_pathid = PathIdentifier.from_target('%s@%s' % 
(cf_url, cf_rev))

'svn info' on a now deleted path fails as the path only existed until 
the time it was moved.


Regards,
Dave