Changeset fb4d788 in mainline for contrib/bazaar/mbprotect/__init__.py

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from the mainline

File:

• contrib/bazaar/mbprotect/__init__.py (modified) (2 diffs)

contrib/bazaar/mbprotect/__init__.py

@@ -60 +60 @@
                 return
         
-        # First permitted case is appending changesets to main branch.Look for
+        # First permitted case is appending changesets to main branch. Look for
         # old tip in new main branch.
         for revision_id in iter_reverse_revision_history(repo, params.new_revid):
                 if revision_id == params.old_revid:
-                        return  # Found old tip
+                        # Old tip found
+                        return
         
         # Another permitted case is backing out changesets. Look for new tip
@@ -70 +71 @@
         for revision_id in iter_reverse_revision_history(repo, params.old_revid):
                 if revision_id == params.new_revid:
-                        return  # Found new tip
+                        # New tip found
+                        return
         
         # Trying to do something else. Reject the change.