Re: merging into a release instead of main trunk

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gerrit Ruesing <address@hidden> writes:

> how is it achieved that FreeBSD users can receive src files via cvsup 
> that are tagged with a RELEASE tag (RELENG_4, RELENG_5,...) while the 
> branch is under further development?

Typically, they install cvsup and configure it with a cvs-supfile that has 

                            ---------------
*default prefix=/home/ncvs
*default host=CHANGE_THIS.FreeBSD.org
*default base=/var
*default release=cvs
*default delete use-rel-suffix

src-all
ports-all
doc-all
cvsroot-all
                            ---------------

which allows them to either mirror the repository along with all the
branches and tags, or just to obtain the top-of-tree for a given branch
as they desire. You may wish to look at the /etc/local/cvsup/cvs-supfile
on your FreeBSD system. Or, just go and read

    http://www.freebsd.org/doc/handbook/cvsup.html

for general information on CVSup itself.

Note:

    RELENG_4 is a branch tag
    RELENG_5 is a branch tag
    RELENG_5_4 is a branch tag
    RELENG_4_11 is a branch tag

    RELENG_4_11_BP is a version tag
    RELENG_4_11_0_RELEASE is a version tag
    RELENG_5_4_0_RELEASE is a version tag

The FreeBSD team does multiple commits and merges between their
branches.

> Is it possible to merge one branch into another and have that available 
> under the same tag?

No.

> Everything I tried in this direction failed so far.
> Can someone please enlighten me on this?

I suspect you are not asking the correct questions...

        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFCgPNK3x41pRYZE/gRAkybAKDd+uxXqWH2IF2WFf46mP/lypWm3gCg4Wrg
4F52eaTyxr67gZr3WJx4rPI=
=Fq4S
-----END PGP SIGNATURE-----