Re: Large objects
Federico Di Gregorio <fog-NGVKUo/i/[email protected]>
| Newsgroups | gmane.comp.python.db.psycopg.devel |
|---|---|
| Organization | initd.org |
| Message-ID | <[email protected]> |
Il giorno lun, 05/05/2008 alle 22.59 +0800, James Henstridge ha scritto: > I had a look at the missing changes on the trunk branch, and have > merged them to 2_0_x. > > There were a few recent changes by Fabio Tranchitella to the > ZPsycopgDA code that were probably intended for 2_0_x, so I brought > them across with "bzr replay". > > The remaining changes were the large object code. Merging them > directly resulted in a lot of conflicts due to previous untracked > merges in subversion. So I did an intermediate merge between trunk > and the 2_0_x branch at the point of the previous merge, which managed > to detect most cases of duplicate code. Great work, thank once again. > I think we can consider the old trunk branch dead now, so it might be > worth renaming things. Perhaps the following: > > trunk => lobject-support > branches/2_0_x => trunk > > A symlink from the old 2_0_x location would keep old checkouts working. Ok. The lobject support was quite stable so we can just do the move you suggested and keep 2.x in trunk. We can always branch a 2.0.6.1 for short term fixes and release trunk as 2.1 if necessary (i.e., if we add a lot of unstable features to trunk). federico -- Federico Di Gregorio http://people.initd.org/fog DISCLAIMER. If I receive a message from you, you are agreeing that: 1. I am by definition, "the intended recipient". 2. All information in the email is mine to do with as I see fit and make such financial profit, political mileage, or good joke as it lends itself to. In particular, I may quote it on USENET or the WWW. 3. I may take the contents as representing the views of your company. 4. This overrides any disclaimer or statement of confidentiality that may be included on your message. _______________________________________________ Psycopg mailing list Psycopg-IAPFreCvJWPBWskQ1e/[email protected] http://lists.initd.org/mailman/listinfo/psycopg
signature.asc
(application/pgp-signature, 189 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBIHyVovcCgrgZGjesRAqrxAKCMSDYvtaU9hqvc6Ch7iX1uBaRj1ACdFpZi /zMNJ+Y7VA9M4Lc9RhmDoUA= =EJ64 -----END PGP SIGNATURE-----