Index: cvs2svn.py
===================================================================
--- cvs2svn.py	(revision 8678)
+++ cvs2svn.py	(working copy)
@@ -315,10 +315,17 @@
     # Ratchet up the highest vendor head revision, if necessary.
     if self.default_branch:
       if revision.find(self.default_branch) == 0:
-        # This revision is on the default branch, so record that it is
+        # This revision is on the default branch, so see if it is
         # the new highest vendor head revision.
         rel_name = relative_name(self.cvsroot, self.fname)[:-2]
-        self.default_branches_db[rel_name] = revision
+        if not self.default_branches_db.has_key(rel_name):
+          # No earlier vendor branch revision
+          self.default_branches_db[rel_name] = revision
+        else:
+          # Check for a branch off of the vendor branch
+          if revision.find('.', len(self.default_branch) + 1) == -1:
+            # This is the main vendor branch, update to this revision
+            self.default_branches_db[rel_name] = revision
     else:
       # No default branch, so make an educated guess.
       if revision == '1.2':