Commits

Augie Fackler committed f67f9d2 Merge

Merge with stable.

Comments (0)

Files changed (3)

 0cbf9fd89672e73165e1bb4db1ec8f7f65b95c94 1.3
 07234759a3f750029ccaa001837d42fa12dd33ee 1.4
 77b22e5b4ea6c248e079afd0f1e544cb5690ce20 1.5
+d0f3a5c2cb56ce65d9ef1c611c8bfbebdc3bef34 1.5.1
-include Makefile hgsubversion/help/*.rst
+include Makefile hgsubversion/help/*.rst tests/fixtures/invalid_utf8.tar.gz
 recursive-include tests *.py *.sh *.svndump *.txt

hgsubversion/svncommands.py

     # changesets that close a branch, and store their first parent
     for rev in xrange(startrev, len(repo)):
         util.progress(ui, 'prepare', rev - startrev, total=numrevs)
-        ctx = repo[rev]
+        try:
+            ctx = repo[rev]
+        except error.RepoError:
+            # this revision is hidden
+            continue
+
         convinfo = util.getsvnrev(ctx, None)
         if not convinfo:
             continue
 
     for rev in xrange(startrev, len(repo)):
         util.progress(ui, 'rebuild', rev-startrev, total=numrevs)
-        ctx = repo[rev]
+        try:
+            ctx = repo[rev]
+        except error.RepoError:
+            # this revision is hidden
+            continue
+
         convinfo = util.getsvnrev(ctx, None)
         if not convinfo:
             continue