Thread: v7.3Beta4 Tag'd and Packaged ...
Morning all ... 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. I've packaged up beta4 based on the branch, and its currently up and available at the ftp site ... please download and test. For those with commit access, please note that v7.3 related stuff should, from now on, be committed *on* the appropriate branch, and v7.4 should be acceptable to add in ... Let me know if there are any problems with the package, especially in the docs area, so that I can put out an announce later on this evening ...
"Marc G. Fournier" <scrappy@hub.org> writes:
> 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 looks like this was only 99.44% right. There are some files and
whole subdirectories that were deleted since REL7_3_STABLE was
originally branched, but your update did not mark them as deleted in the
branch:
Only in REL7_3/pgsql/contrib: retep
Only in REL7_3/pgsql/contrib/xml: README
Only in REL7_3/pgsql/contrib/xml: pgxml.source
Only in REL7_3/pgsql/contrib/xml: pgxml_dom.source
Only in REL7_3/pgsql/doc/src/sgml: libpgeasy.sgml
Only in REL7_3/pgsql/doc/src/sgml: odbc.sgml
Only in REL7_3/pgsql/doc/src/sgml: recovery.sgml
Only in REL7_3/pgsql/doc/src/sgml: version.sgml
Only in REL7_3/pgsql/doc/src/sgml: y2k.sgml
Only in REL7_3/pgsql/src/interfaces/jdbc: CHANGELOG
Only in REL7_3/pgsql/src/interfaces/jdbc: Implementation
Only in REL7_3/pgsql/src/interfaces/jdbc: jdbc.jpx
Only in REL7_3/pgsql/src/interfaces/jdbc: utils
Only in REL7_3/pgsql/src/test/regress/expected: geometry-bsdi-precision.out
Perhaps easiest to just re-delete them in the branch? Or is there a
cleaner way?
> For those with commit access, please note that v7.3 related stuff
> should, from now on, be committed *on* the appropriate branch, and v7.4
> should be acceptable to add in ...
Right-o: HEAD is 7.4devel now ...
regards, tom lane
On Mon, 4 Nov 2002, Tom Lane wrote: > "Marc G. Fournier" <scrappy@hub.org> writes: > > 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 looks like this was only 99.44% right. There are some files and > whole subdirectories that were deleted since REL7_3_STABLE was > originally branched, but your update did not mark them as deleted in the > branch: > > Only in REL7_3/pgsql/contrib: retep > Only in REL7_3/pgsql/contrib/xml: README > Only in REL7_3/pgsql/contrib/xml: pgxml.source > Only in REL7_3/pgsql/contrib/xml: pgxml_dom.source > Only in REL7_3/pgsql/doc/src/sgml: libpgeasy.sgml > Only in REL7_3/pgsql/doc/src/sgml: odbc.sgml > Only in REL7_3/pgsql/doc/src/sgml: recovery.sgml > Only in REL7_3/pgsql/doc/src/sgml: version.sgml > Only in REL7_3/pgsql/doc/src/sgml: y2k.sgml > Only in REL7_3/pgsql/src/interfaces/jdbc: CHANGELOG > Only in REL7_3/pgsql/src/interfaces/jdbc: Implementation > Only in REL7_3/pgsql/src/interfaces/jdbc: jdbc.jpx > Only in REL7_3/pgsql/src/interfaces/jdbc: utils > Only in REL7_3/pgsql/src/test/regress/expected: geometry-bsdi-precision.out > > Perhaps easiest to just re-delete them in the branch? Or is there a > cleaner way? Easiest is to re-delete them ... from what i can tell from teh CVS docs, we did this backwards ... we should have worked on the branch itself, and then merges into the working tree ... something to remember for next time
"Marc G. Fournier" <scrappy@hub.org> writes:
>> Perhaps easiest to just re-delete them in the branch? Or is there a
>> cleaner way?
> Easiest is to re-delete them ...
Okay, done that. REL7_3_STABLE branch now matches CVS tip --- or did
until I branded HEAD's configure.in as 7.4devel, a few moments ago.
Do you want to regenerate the 7.3b4 tarball so it omits the deleted files?
Probably not really essential to do so.
Meanwhile, the floodgates are open for 7.4 development on HEAD.
regards, tom lane
On Mon, 2002-11-04 at 15:52, Tom Lane wrote: > "Marc G. Fournier" <scrappy@hub.org> writes: > >> Perhaps easiest to just re-delete them in the branch? Or is there a > >> cleaner way? > > > Easiest is to re-delete them ... > > Okay, done that. REL7_3_STABLE branch now matches CVS tip --- or did > until I branded HEAD's configure.in as 7.4devel, a few moments ago. > > Do you want to regenerate the 7.3b4 tarball so it omits the deleted files? > Probably not really essential to do so. Out of curiousity, is there an easy (heh) way to upgrade(change?) a checked out tree to be off the branch? -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 972-414-9812 E-Mail: ler@lerctr.org US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749
>>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
> Out of curiousity, is there an easy (heh) way to upgrade(change?) a
> checked out tree to be off the branch?
cvs update -rYOUR_BRANCH_NAME_HERE .
- Thomas
On Tue, 5 Nov 2002, Thomas Lockhart wrote:
> >>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?
Okay, definitely something that I'd like to document how to do for next
time ... from what I read in the CVS docs (info cvs), you could pull a
branch into HEAD using the -j option ... for instance, I'd checkout HEAD,
and then run:
cvs update -j REL7_3_STABLE
to pull in those changes that were made to the REL7_3_STABLE branch ...
But, if I did:
cvs checkout -rREL7_3_STABLE pgsql
What would I use as BRANCHNAME in the -j to 'pull in' the changes we made
to HEAD? Or is there where I'm misunderstanding something?
Tom Lane writes: > Right-o: HEAD is 7.4devel now ... Will someone merge the 7.3 branch into 7.4devel when the former is released? I don't feel like double-patching... -- Peter Eisentraut peter_e@gmx.net
On Tue, 5 Nov 2002, Peter Eisentraut wrote: > Tom Lane writes: > > > Right-o: HEAD is 7.4devel now ... > > Will someone merge the 7.3 branch into 7.4devel when the former is > released? I don't feel like double-patching... At this stage, there shouldn't be anything really going *into* STABLE, if we want to get to RC1 ...
...
> to pull in those changes that were made to the REL7_3_STABLE branch ...
Right.
> But, if I did:
> cvs checkout -rREL7_3_STABLE pgsql
> What would I use as BRANCHNAME in the -j to 'pull in' the changes we made
> to HEAD? Or is there where I'm misunderstanding something?
Use "HEAD" for the tag from within the REL7_3_STABLE branch:
cvs update -jHEAD pgsql
The files will then show that they are modified, and you can then commit
the changes to your branch.
- Thomas
On Tue, 5 Nov 2002, Thomas Lockhart wrote: > ... > > to pull in those changes that were made to the REL7_3_STABLE branch ... > > Right. > > > But, if I did: > > cvs checkout -rREL7_3_STABLE pgsql > > What would I use as BRANCHNAME in the -j to 'pull in' the changes we made > > to HEAD? Or is there where I'm misunderstanding something? > > Use "HEAD" for the tag from within the REL7_3_STABLE branch: > > cvs update -jHEAD pgsql > > The files will then show that they are modified, and you can then commit > the changes to your branch. *groan* I figured I was restricted to that which shows as BRANCH/TAGs in a cvs log :( Noted for next release cycle ... thanks
Marc G. Fournier writes: > At this stage, there shouldn't be anything really going *into* STABLE, if > we want to get to RC1 ... If we don't put anything into stable then we will never get to anything. Surely we still need to put in some fixes and documentation updates. -- Peter Eisentraut peter_e@gmx.net
Peter Eisentraut wrote: > Marc G. Fournier writes: > > > At this stage, there shouldn't be anything really going *into* STABLE, if > > we want to get to RC1 ... > > If we don't put anything into stable then we will never get to anything. > Surely we still need to put in some fixes and documentation updates. I think he means nothing _major_ will be going into stable, just stuff we want for RC1/final. -- 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, Pennsylvania19073
scrappy@hub.org ("Marc G. Fournier") writes:
> On Tue, 5 Nov 2002, Thomas Lockhart wrote:
>
> > ...
> > > to pull in those changes that were made to the REL7_3_STABLE branch ...
> >
> > Right.
> >
> > > But, if I did:
> > > cvs checkout -rREL7_3_STABLE pgsql
> > > What would I use as BRANCHNAME in the -j to 'pull in' the changes we made
> > > to HEAD? Or is there where I'm misunderstanding something?
> >
> > Use "HEAD" for the tag from within the REL7_3_STABLE branch:
> >
> > cvs update -jHEAD pgsql
> >
> > The files will then show that they are modified, and you can then commit
> > the changes to your branch.
>
> *groan* I figured I was restricted to that which shows as BRANCH/TAGs in
> a cvs log :(
>
> Noted for next release cycle ... thanks
Some CVS commands have HEAD meaning "head of the branch I'm currently on"
and not the 'real' head, so watch out for confusing results when using
HEAD on a branch. (I'm quite sure this applies to 'cvs diff' but I don't
remember if it affects 'cvs update -j' also.)
This was explicitly added to CVS as a 'feature' a few years ago.
(Why is beyond me since I find it incredibly stupid :-)
_
Mats Lofkvist
mal@algonet.se