# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1268169517 -3600
# Node ID bcdf376805694da77760049b49622bc439e9b18f
# Parent  da7662ea741fb0761e7ecc6e26eea5241a9d789a# Parent  508fda6b8637af8a4c223a865c4d35a029fb4242
Merge with crew-stable

diff -r da7662ea741f -r bcdf37680569 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Tue Mar 09 20:47:35 2010 +0100
+++ b/hgext/convert/subversion.py	Tue Mar 09 22:18:37 2010 +0100
@@ -812,6 +812,9 @@
                         break
                     if not paths:
                         self.ui.debug('revision %d has no entries\n' % revnum)
+                        # If we ever leave the loop on an empty
+                        # revision, do not try to get a parent branch
+                        lastonbranch = lastonbranch or revnum == 0
                         continue
                     cset, lastonbranch = parselogentry(paths, revnum, author,
                                                        date, message)