# HG changeset patch # User Augie Fackler # Date 1372029512 18000 # Node ID f67f9d28b0accdce0f6d19f99a88be6fac6a6fc1 # Parent c6e9889dba27694eb8cc90150992c51e626ea642# Parent b5b1fce26f1f8139236b901ca55165707c464f0b Merge with stable. diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -8,3 +8,4 @@ 4bbc6bf947f56a92e95a04a27b94a9f72d5482d7 0cbf9fd89672e73165e1bb4db1ec8f7f65b95c94 1.3 07234759a3f750029ccaa001837d42fa12dd33ee 1.4 77b22e5b4ea6c248e079afd0f1e544cb5690ce20 1.5 +d0f3a5c2cb56ce65d9ef1c611c8bfbebdc3bef34 1.5.1 diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -include Makefile hgsubversion/help/*.rst +include Makefile hgsubversion/help/*.rst tests/fixtures/invalid_utf8.tar.gz recursive-include tests *.py *.sh *.svndump *.txt diff --git a/hgsubversion/svncommands.py b/hgsubversion/svncommands.py --- a/hgsubversion/svncommands.py +++ b/hgsubversion/svncommands.py @@ -135,7 +135,12 @@ def _buildmeta(ui, repo, args, partial=F # 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 @@ -163,7 +168,12 @@ def _buildmeta(ui, repo, args, partial=F 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