Changeset 1151 in tailor for vcpx/cvs.py

Timestamp:

05/28/06 09:34:22 (7 years ago)

Author:

jeremy.barnes@…

Hash name:

20060528073422-0ac44-d367fa9e6a08b7f4320533a3813f8415a8d6c449

Message:

Skip CVS revision on the wrong branch
CVS has a bug with the rlog command when using -r:branch syntax,
which leads to changesets on the wrong branch being listed in the
log. This would lead to a "Something went wrong: unable to determine
the exact upstream revision of the checked out tree" error, since the
date of the incorrect revision was much earlier than the date of the
branch.

File:

• vcpx/cvs.py (modified) (1 diff)

vcpx/cvs.py

@@ -402 +402 @@
                 if cs is None:
                     break
+
                 date,author,changelog,e,rev,state,newentry = cs
+
+                # CVS seems to sometimes mess up what it thinks the branch is...
+                if not cvs_revs_same_branch(normalize_cvs_rev(rev), branchnum):
+                    self.log.warning("Skipped revision %s on entry %s "
+                                     "as revision didn't match branch revision %s "
+                                     "for branch %s"
+                                     % (str(normalize_cvs_rev(rev)), entry,
+                                        str(branchnum), str(branch)))
+                    expected_revisions -= 1
+                    continue
 
                 # Skip spurious entries added in a branch