Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
authorPatrick Mezard <pmezard@gmail.com>
Tue, 09 Mar 2010 22:18:37 +0100
changeset 10619 bcdf37680569
parent 10617 da7662ea741f (current diff)
parent 10618 508fda6b8637 (diff)
child 10620 1ee14abe07b4
Merge with crew-stable
--- 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)
Mercurial