← Back to team overview

openstack team mailing list archive

Re: SQLAlchemy migration number conflicts


I was getting migrate errors because gaps are not allowed in the migration numbers.  Maybe this could be changed so that folks could use arbitrarily large numbers in their branches until ready to propose for merge.    That would help minimize conflicts and manual bzr rename on our local branches when merging from trunk.

The reservation numbers need to be monotonically increasing at trunk merge because suppose migration 12 gets reserved but doesn't submit any code changes, then migration 13 comes in and gets approved and merged, then migration 12 merges code and breaks migration 13.  You can't revert back to migration 11 because the new migration 12 is in the way.   

Brian Schott

On Jun 1, 2011, at 11:12 AM, Ed Leafe wrote:

> 	Another option is to have a migration reservation page in the wiki. It would contain a table with a sequence of numbers in the first column, and a blank cell in the right column. When you need to add a migration, fill your branch name next to the first available number, and that number's yours. If there's a conflict, it will be clear who needs to change their number.
> 	It's a manual process, sure, but this isn't a process that's repeated all that often.
> -- Ed Leafe
> _______________________________________________
> Mailing list: https://launchpad.net/~openstack
> Post to     : openstack@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openstack
> More help   : https://help.launchpad.net/ListHelp

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Follow ups