Skip to content

Commit 2ebb03c

Browse files
committed
Update FAQ_DEV.
1 parent 4343f57 commit 2ebb03c

File tree

1 file changed

+5
-46
lines changed

1 file changed

+5
-46
lines changed

doc/src/FAQ/FAQ_DEV.html

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<H1>Developer's Frequently Asked Questions (FAQ) for
1313
PostgreSQL</H1>
1414

15-
<P>Last updated: Mon Nov 26 21:48:19 EST 2001</P>
15+
<P>Last updated: Tue Nov 27 15:45:22 EST 2001</P>
1616

1717

1818
<P>Current maintainer: Bruce Momjian (<A href=
@@ -651,51 +651,13 @@ <H3><A name="16">16</A>) How are CVS branches managed?</H3>
651651
next release.
652652

653653
The first thing you have to know is the branch name for the branch you
654-
are interested in getting at. Unfortunately Marc has been less than
655-
100% consistent in naming the things. One way to check is to apply
656-
"cvs log" to any file that goes back a long time, for example HISTORY
657-
in the top directory:
658-
659-
$ cvs log HISTORY | more
660-
661-
RCS file: /home/projects/pgsql/cvsroot/pgsql/HISTORY,v
662-
Working file: HISTORY
663-
head: 1.106
664-
branch:
665-
locks: strict
666-
access list:
667-
symbolic names:
668-
REL7_1_STABLE: 1.106.0.2
669-
REL7_1_BETA: 1.79
670-
REL7_1_BETA3: 1.86
671-
REL7_1_BETA2: 1.86
672-
REL7_1: 1.102
673-
REL7_0_PATCHES: 1.70.0.2
674-
REL7_0: 1.70
675-
REL6_5_PATCHES: 1.52.0.2
676-
REL6_5: 1.52
677-
REL6_4: 1.44.0.2
678-
release-6-3: 1.33
679-
SUPPORT: 1.1.1.1
680-
PG95-DIST: 1.1.1
681-
keyword substitution: kv
682-
total revisions: 129; selected revisions: 129
683-
More---q
684-
685-
Unfortunately "cvs log" isn't all that great about distinguishing
686-
branches from tags --- it calls 'em all "symbolic names". (A "tag" just
687-
marks a specific timepoint across all files --- it's essentially a
688-
snapshot whereas a branch is a changeable fileset.) Rule of thumb is
689-
that names attached to four-number versions where the third number is
690-
zero represent branches, the others are just tags. Here we can see that
691-
the extant branches are
654+
are interested in getting at. Ian Lance Taylor points out that branches
655+
and tags can be distiguished by using "cvs status -v". Typical branch
656+
names are:
657+
692658
REL7_1_STABLE
693659
REL7_0_PATCHES
694660
REL6_5_PATCHES
695-
The next commit to the head will be revision 1.107, whereas any changes
696-
committed into the REL7_1_STABLE branch will have revision numbers like
697-
1.106.2.*, corresponding to the branch number 1.106.0.2 (don't ask where
698-
the zero went...).
699661

700662
OK, so how do you do work on a branch? By far the best way is to create
701663
a separate checkout tree for the branch and do your work in that. Not
@@ -736,9 +698,6 @@ <H3><A name="16">16</A>) How are CVS branches managed?</H3>
736698
or two, so that we won't have to double-patch the first wave of fixes.
737699
</PRE>
738700

739-
<P>Also, Ian Lance Taylor points out that branches and tags can be
740-
distiguished by using "cvs status -v".</P>
741-
742701
<H3><A name="17">17</A>) How go I get involved in PostgreSQL
743702
development?</H3>
744703
<P>This was written by Lamar Owen:</P>

0 commit comments

Comments
 (0)