Thread: CVSROOT: remerge earthdistance back into pgql-server/contrib and move

Log Message:
-----------

remerge earthdistance back into pgql-server/contrib and move pgsql-server to pgsql

Modified Files:
--------------
    CVSROOT:
        modules (r1.37 -> r1.38)
        (http://developer.postgresql.org/cvsweb.cgi/CVSROOT/modules.diff?r1=1.37&r2=1.38)

> remerge earthdistance back into pgql-server/contrib and move
> pgsql-server to pgsql

Ugh, this is going to create a *HUGE* headache for many developers.  I
think a message to announce@ would be justified with some helpful bits
of advice such as the following:

### BEGIN HINT
Run the following two commands from inside of your PostgreSQL source
tree.

To keep your existing tree working, run the following command:

find . -name Repository -exec perl -pi.proj_rename -e \
    's#/projects/cvsroot/pgsql-server#/projects/cvsroot/pgsql#' {} \;

To prevent every modified file from having a conflict, run the
following command:

find . -type f -exec perl -p -i.proj_rename -e \
    's#\$PostgreSQL: pgsql-server/#\$PostgreSQL: pgsql/#g' {} \;

Once you're satisfied that the search-replace was successful, you can
remove the .proj_rename files by typing:

find . -name '*.proj_rename' -delete
### END HINT

-sc

--
Sean Chittenden

Uh, we have not had many reports yet of problems from users.

---------------------------------------------------------------------------

Sean Chittenden wrote:
> > remerge earthdistance back into pgql-server/contrib and move
> > pgsql-server to pgsql
>
> Ugh, this is going to create a *HUGE* headache for many developers.  I
> think a message to announce@ would be justified with some helpful bits
> of advice such as the following:
>
> ### BEGIN HINT
> Run the following two commands from inside of your PostgreSQL source
> tree.
>
> To keep your existing tree working, run the following command:
>
> find . -name Repository -exec perl -pi.proj_rename -e \
>     's#/projects/cvsroot/pgsql-server#/projects/cvsroot/pgsql#' {} \;
>
> To prevent every modified file from having a conflict, run the
> following command:
>
> find . -type f -exec perl -p -i.proj_rename -e \
>     's#\$PostgreSQL: pgsql-server/#\$PostgreSQL: pgsql/#g' {} \;
>
> Once you're satisfied that the search-replace was successful, you can
> remove the .proj_rename files by typing:
>
> find . -name '*.proj_rename' -delete
> ### END HINT
>
> -sc
>
> --
> Sean Chittenden
>
>
> ---------------------------(end of broadcast)---------------------------
> TIP 7: don't forget to increase your free space map settings
>

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073

Sean Chittenden <chitt@speakeasy.net> writes:
>> remerge earthdistance back into pgql-server/contrib and move
>> pgsql-server to pgsql

> Ugh, this is going to create a *HUGE* headache for many developers.

If you had a problem with it, you should have spoken up earlier when
it was being discussed.

> I think a message to announce@ would be justified with some helpful bits
> of advice such as the following:

I agree that it needs to be announced, but it would be sufficient to
tell people to do a fresh checkout.  This business of sed'ing changes
into your CVS/Repository files seems pretty error-prone to me.

            regards, tom lane

>>> remerge earthdistance back into pgql-server/contrib and move
>>> pgsql-server to pgsql
>
>> Ugh, this is going to create a *HUGE* headache for many developers.
>
> If you had a problem with it, you should have spoken up earlier when
> it was being discussed.

I missed that discussion (limited bandwidth to read Pg mail, not
reading hackers@ as often as I should).  Apologies for the noise, it
just caught me by surprise with all of the conflicts I had this
morning.

>> I think a message to announce@ would be justified with some helpful
>> bits
>> of advice such as the following:
>
> I agree that it needs to be announced, but it would be sufficient to
> tell people to do a fresh checkout.  This business of sed'ing changes
> into your CVS/Repository files seems pretty error-prone to me.

It's only as hackish of a way to update a checked out repository as CVS
really is.  :)  -sc

--
Sean Chittenden

On Mon, 11 Oct 2004, Tom Lane wrote:

> Sean Chittenden <chitt@speakeasy.net> writes:
>>> remerge earthdistance back into pgql-server/contrib and move
>>> pgsql-server to pgsql
>
>> Ugh, this is going to create a *HUGE* headache for many developers.
>
> If you had a problem with it, you should have spoken up earlier when
> it was being discussed.
>
>> I think a message to announce@ would be justified with some helpful bits
>> of advice such as the following:
>
> I agree that it needs to be announced, but it would be sufficient to
> tell people to do a fresh checkout.

Shouldn't everyone using CVS be following -hackers anyway?

----
Marc G. Fournier           Hub.Org Networking Services (http://www.hub.org)
Email: scrappy@hub.org           Yahoo!: yscrappy              ICQ: 7615664

"Marc G. Fournier" <scrappy@postgresql.org> writes:
>> I agree that it needs to be announced, but it would be sufficient to
>> tell people to do a fresh checkout.

> Shouldn't everyone using CVS be following -hackers anyway?

You would think, but Mike Fuhr at least wasn't; he was griping about
the change this AM on -general.  I expect a few more gripes over the
next week or two if we don't announce it more widely.

            regards, tom lane

> remerge earthdistance back into pgql-server/contrib and move
> pgsql-server to pgsql

Ugh, this is going to create a *HUGE* headache for many developers.  I
think a message to announce@ would be justified with some helpful bits
of advice such as the following:

### BEGIN HINT
Run the following two commands from inside of your PostgreSQL source
tree.

To keep your existing tree working, run the following command:

find . -name Repository -exec perl -pi.proj_rename -e \
    's#/projects/cvsroot/pgsql-server#/projects/cvsroot/pgsql#' {} \;

To prevent every modified file from having a conflict, run the
following command:

find . -type f -exec perl -p -i.proj_rename -e \
    's#\$PostgreSQL: pgsql-server/#\$PostgreSQL: pgsql/#g' {} \;

Once you're satisfied that the search-replace was successful, you can
remove the .proj_rename files by typing:

find . -name '*.proj_rename' -delete
### END HINT

-sc

--
Sean Chittenden