Changeset 3b3e776 in mainline for contrib/bazaar/mbprotect/__init__.py

Timestamp:

2010-02-05T10:57:50Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (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:

merged with head

File:

• contrib/bazaar/mbprotect/__init__.py (modified) (1 diff)

contrib/bazaar/mbprotect/__init__.py

@@ -52 +52 @@
         return
 
-    # Look for old tip in new main branch.
+    # First permitted case is appending changesets to main branch.Look for
+    # old tip in new main branch.
     for revision_id in repo.iter_reverse_revision_history(params.new_revid):
         if revision_id == params.old_revid:
             return      # Found old tip
 
-    # Old tip was not found. Reject the change.
+    # Another permitted case is backing out changesets. Look for new tip
+    # in old branch.
+    for revision_id in repo.iter_reverse_revision_history(params.old_revid):
+        if revision_id == params.new_revid:
+            return      # Found new tip
+
+    # Trying to do something else. Reject the change.
     raise TipChangeRejected('Bad tip. Read http://trac.helenos.org/trac.fcgi/' +
         'wiki/BazaarWorkflow')