Mercurial > hgsubversion

diff fetch_command.py @ 39:b3c7b844b782

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some more fixes of cases discovered in the melange repo. If anyone knows how I can reproduce a "replaced" state in Subversion, I'd love to be able to make a real test case for this code.
author Augie Fackler <durin42@gmail.com>
date Sun, 26 Oct 2008 22:06:13 -0500
parents 9ee7ce0505eb
children 485ae93bc358
line wrap: on
line diff
--- a/fetch_command.py
+++ b/fetch_command.py
@@ -394,7 +394,16 @@ def stupid_svn_server_pull_rev(ui, svn, 
                 used_diff = False
                 shutil.rmtree(our_tempdir)
                 os.makedirs(our_tempdir)
-                svn.fetch_all_files_to_dir(diff_path, r.revnum, our_tempdir)
+                try:
+                    svn.fetch_all_files_to_dir(diff_path, r.revnum, our_tempdir)
+                except core.SubversionException, e:
+                    # apr_err 21 means that we couldn't rename a file to be a dir.
+                    # This happens only in the case (at least right now) of a file
+                    # located in brances or tags, which we don't support anyway.
+                    if e.apr_err == 21:
+                        continue
+                    else:
+                        raise
             except core.SubversionException, e:
                 if e.apr_err == 170000 or (e.message.startswith("URL '")
                      and e.message.endswith("' doesn't exist")):