Re: Large objects

On 04/05/2008, James Henstridge <[email protected]> wrote:
> On 03/05/2008, Federico Di Gregorio <fog-NGVKUo/i/[email protected]> wrote:
>  > Il giorno ven, 02/05/2008 alle 16.22 +0200, Oswaldo Hernández ha
>  >  scritto:
>  >
>  > > Hello,
>  >  >
>  >  > I would like to use large objects but i don't find any info how to do it with psycopg2.
>  >  >
>  >  > Making a google search only find an old branch than can do it.
>  >
>  >
>  > Support is in trunk and need to be merged into current stable branch or
>  >  (much better) the reverse.
>
>
> Given that the results of a merge will be the same whichever direction
>  it is done, and that the majority of development has been done on the
>  2_0_x branch, I'd recommend merging trunk into 2_0_x.
>
>  Once that is done, it might make sense to call the resulting branch
>  "trunk" though.

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.

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.

James.