# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: rlight2@gmail.com-20090626183137-6922cz6w7jcptd86
# target_branch: lp:zebracomic
# testament_sha1: c17bea2792901580b90012c1ac15a7ec0f023dee
# timestamp: 2009-06-26 11:31:47 -0700
# base_revision_id: rlight2@gmail.com-20090505015639-034tzwmrzuukvih6
# 
# Begin patch
=== modified file 'comic/models.py'
--- comic/models.py	2009-05-05 01:25:32 +0000
+++ comic/models.py	2009-06-26 18:31:37 +0000
@@ -337,10 +337,6 @@
                 strip.save(calculate_stripno=False)
     
     def _calc_ins_stripno(self, before, after):
-        # Disallow rude publish date changing
-        # TODO: Check for previous date being published
-        if after.count() > 0 and after[0].is_published:
-            raise ValueError("Cannot move published strips")
         # Find new strip number
         old_stripno = self.stripno
         if before.count() > 0:
@@ -349,12 +345,15 @@
                 new_stripno -= 1
         else:
             new_stripno = 1
+        # Are we already correctly placed?  Then forget about it!
+        if self.stripno == old_stripno:
+            return
+        # Disallow rude publish date changing
+        if after.count() > 0 and after[0].is_published:
+            raise ValueError("Cannot move published strips")
         # Move ourselves to zero to prevent uniqueness problems
         self.stripno = 0
         self.save(calculate_stripno=False)
-        # Are we already correctly placed?  Then forget about it!
-        if self.stripno == old_stripno:
-            return
         # Now do sorting
         for strip in after.reverse():
             if strip.stripno > old_stripno:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfn80FQAAbNfgARQeWP///8E
FQq//9/wUAOmu3pes9Qedu96EkiaaU2E00whoKNqephpAGR6jEPKDKEam9SNG0QARgAAAARgEoIE
mNCanomUDTyT1NNGgAGIaA2pEGkybSTNRpk9QNPUGmgBkAAElJPFT8jKT9KGymJkAAaANAAaPFXd
jQ3KS8OX2oxIq8ZVNHJO+QxadkYvdDGTTWIIC3elNx9IszBTn8iMImVzMOoc4aGXNdZoPSzxp8vJ
9DY/2X3/UY9u2djUZXfroz0GtU8Go4Qpnn1+TdbzuRVfLpiJ9tnCQRvPXRfmdnomsWG6wyCIyG0X
Fcdb7PVIr/V6u2l15WSw2XY5hKpooM2IY4CY1FTiRJkK6g3xkhQfsYb8yN5yqEtTNczcfFdJMviY
CQTuJMmOQlTePKPWdRlRCcB8jTOYnMkJgcCRr6MYrD9UY3t2vinSJChJFNkU54KqVA6I5QXJKFxQ
ojI4xIsnqGS8clqm/BN5uHS/NlraA+btbsGbEa5FsHNatZbw1A2ApCcrXG0Ka2SIwqLTULCRYKlR
NxeFEKDLAQmDzcBnlrpYqRKBHlgRl4LUsRB8yKMqADieIWAeMJKBArMqZofJkIqxYU2wvB9Zf2mx
RPcp68vBcKHF9cGY6lNvm+p6uLzYnJnhPWiEYVVFO2UHhi8FL9MJXIoXMucKrVwzOFu0tOnStSRe
OFXYkO7pIf2UrjGGX98KBQlVm9jSdOimzaNQs/cYG8nKEWGLFic0c4N2Iha8B/SI1/ViJY6YciBy
IpyMSVdpiKEDqrQ22n2nsO8t44d6w3E737+Oaq3w637dTfAYMOz3HIruKc88A7KeptHCQdq1QutU
r7UyMlMJ3EdAYlijMglT5LGr2FZcWkD57rcGDE2PclliCf5pGvZ535YpzmBsjjneCdUr6bxquiJD
8GJz0pGxXJGhRMOQVV8tT4WAZl4f6ipVAVzW88kv57dovFazSHctqRQX6XnLaCpMahW6U43v3qAU
TOCyUky889agtttUrQn5FeYKIWZRwTwTKVJ7J3a0par7aEp2Ew80MrFKWQSeB0NFcEAdZgWqujsk
sbJl19yaQB1CexCYaScUpr61bfO5GVwc3TdM1+TqFGrhTlZPopmvX8u2MWDIs05pT0DCPdaMpeyb
U4TzTonaLuaQxZi2jFRxAoALmGchaBWfRmuFqORdhpI4GKggf3CNwLzP2RUahhtT1dgSpGGJGI4t
hItZE0vqyFddUXaDYOidhEAMad4MsqGrRgLnI6QsYqeYQaad1QtMw/RdyRThQkPn80FQ