Horton
Menu

Re: v7.3Beta4 Tag'd and Packaged ...

lockhart@fourpalms.org

View thread
From: Thomas Lockhart <lockhart@fourpalms.org>
To: Tom Lane <tgl@sss.pgh.pa.us>, "Marc G. Fournier" <scrappy@hub.org>
Cc: pgsql-hackers@postgresql.org
Date: 2002-11-05T06:18:52Z
Lists: pgsql-hackers 
>>As I was unable to figure out a way of merging HEAD into a BRANCH
>>(BRANCH into HEAD is easy), I moved the REL7_3_STABLE tag up to today, so
>>that the BRANCH is in a more appropriate location.

It is easy to move both directions; I've done it. You need to have the 
right stuff in your checked-out tree (probably the branch), and you need 
to do the merge from HEAD. What went wrong in trying to do that?

                  - Thomas