info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branching / cvs question


From: LN Cisneros
Subject: branching / cvs question
Date: Mon, 7 Apr 2003 14:24:45 -0700 (GMT)

I am delving deeply into how cvs records and maintains branching in the rcs 
files.  

I have read thoroughly the cedervquist manual at cvshome.orig.  If anyone can 
provide more links to where this is documented that would be great.

A specific question I have is in regards to a file I've grabbed from the 
XFREE86 source (included below).

As you can see it's been branched a few times.  The questions I have are:

1) There is an xf-3_2A-branch and a xf-3_3-branch.  The both seem to be 
branched from the 1.1.1.1 version of the X11R6 branch.  Why do they both have 
their changes versioned the exact same, i.e. they both have a "magic" branch 
number of 1.1.1.1.0.4?  Shouldn't one of them be 1.1.1.1.0.6?

2)  Is the XF11R6 a vendor branch?

3)  What do all those "symbols" mean?  How do you tell if they are a branch 
name or not? Will a branch always point to a "magic" branch number?

3)  If changes are merged from a branch back into main, do cvs track this?

Thanks for the help!

L.

Here's the file:
head    1.5;
access;
symbols
        dhd-20020916:1.5
        xf-4_2_1:1.5
        xf-4_2_0_1:1.5
        xf-4_2_99_1:1.5
        xf-4_2_0-bindist-1:1.5
        xf-4_2_0-bindist:1.5
        dri-20020222-merge:1.5
        before-mesa-4_0-import:1.5
        dri-20020129-merge:1.5
        xf-4_2-branch:1.5.0.4
        xf-4_2_0:1.5
        xf-4_2-bp:1.5
        xf-4_1_99_7:1.5
        xf-4_1_99_6:1.5
        xf-4_1_99_5:1.5
        Domain-sync4:1.5
        xf-4_1_99_4:1.5
        xf-3_3_6a:1.1.1.1.4.3
        xf-4_0_3a:1.2
        xf-4_1_0_1:1.3.2.2
        Domain-sync3:1.5
        xf-4_1_99_3:1.5
        Domain-sync2:1.5
        xf-4_1_99_2:1.5
        Domain-sync1:1.5
        Domain-branch:1.5.0.2
        Domain-base:1.5
        xf-4_1_99_1:1.5
        dhd-20010817:1.5
        xf-4_1_0-bindist:1.3.2.2
        xf-4_1_0:1.3.2.1
        xf-4_0_99_902:1.3.2.1
        xf-4_0_99_901:1.3.2.1
        xf-4_1-branch:1.3.0.2
        xf-4_0_99_900:1.3
        xf-4_0_99_3:1.3
        xf-4_0_99_2:1.3
        dhd-20010328:1.3
        xf-4_0_3:1.2
        xf-4_0_2c:1.2
        xf-4_0_2b:1.2
        xf-4_0_2a:1.2
        xf-4_0_99_1:1.3
        X11R6-5-1:1.1.1.2
        pre-R651-import:1.2
        xf-4_0_2-bindist:1.2
        xf-4_0_2-branch:1.2.0.6
        xf-4_0_2:1.2
        xf-4_0_1Zc:1.2
        xf-4_0_1Zb:1.2
        xf-4_0_1Za:1.2
        xf-4_0_1Z:1.2
        xf-4_0_1h:1.2
        xf-4_0_1g:1.2
        xf-4_0_1f:1.2
        xf-4_0_1e:1.2
        xf-4_0_1d:1.2
        xf-4_0_1c:1.2
        xf-4_0_1b:1.2
        xf-4_0_1a:1.2
        xf-4_0_1-bindist:1.2
        xf-4_0_1:1.2
        xf-4_0Z:1.2
        xf-4_0g:1.2
        xf-4_0f:1.2
        xf-4_0e:1.2
        xf-4_0d:1.2
        xf-4_0c:1.2
        xf-3_3-branch:1.1.1.1.0.4
        xf-4_0b:1.2
        xf-4_0a:1.2
        xf-4_0-bindist:1.2
        xf-4_0:1.2
        xf-3_9_18Za:1.2
        xf-3_9_18Z:1.2
        xf-3_9_18b:1.2
        xf-3_9_18a:1.2
        xf-3_9_18:1.2
        xf-3_9_17Z:1.2
        xf-3_9_17f:1.2
        xf-3_9_17e:1.2
        xf-3_9_17d:1.2
        xf-3_9_17c:1.2
        xf-3_9_17b:1.2
        xf-3_9_17a:1.2
        xf-3_3_6:1.1.1.1.4.3
        xf-3_9_17:1.2
        xf-3_9_16Za:1.2
        xf-3_9_16Z:1.2
        xf-3_3_5Za:1.1.1.1.4.3
        xf-3_9_16f:1.2
        xf-3_3_5Z:1.1.1.1.4.3
        xf-3_9_16e:1.2
        xf-3_3_5c:1.1.1.1.4.3
        xf-3_9_16d:1.2
        xf-3_3_5b:1.1.1.1.4.3
        xf-3_3_5a:1.1.1.1.4.3
        xf-3_9_16c:1.2
        xf-3_9_16b:1.2
        xf-3_9_16a:1.2
        xf-3_9_16:1.2
        xf-3_9_15d:1.2
        xf-3_3_5:1.1.1.1.4.3
        xf-3_9_15c:1.2
        xf-3_9_15b:1.2
        xf-3_3_4Z:1.1.1.1.4.3
        xf-3_9_15a:1.2
        xf-3_3_4d:1.1.1.1.4.3
        xf-3_3_4c:1.1.1.1.4.3
        xf-3_3_4b:1.1.1.1.4.3
        xf-3_3_4a:1.1.1.1.4.3
        xf-3_9_15:1.2
        xf-3_9Py:1.2
        xf-3_3_4:1.1.1.1.4.3
        xf-3_9Px:1.2
        xf-3_9Pw:1.2
        xf-3_9Pv:1.2
        xf-3_9Pu:1.2
        xf-3_3_3_1Z:1.1.1.1.4.3
        xf-3_9Pt:1.2
        xf-3_3_3_1f:1.1.1.1.4.3
        xf-3_9Ps:1.2
        xf-3_9Pr:1.2
        xf-3_9Phb:1.2
        xf-3_9Pq:1.2
        xf-3_3_3_1e:1.1.1.1.4.3
        xf-3_9Pp:1.2
        xf-3_9Pha:1.2
        xf-3_3_3_1d:1.1.1.1.4.3
        xf-3_9Po:1.2
        xf-3_9Pn:1.2
        xf-3_3_3_1c:1.1.1.1.4.3
        xf-3_9Pm:1.2
        xf-3_9Pl:1.2
        xf-3_9Pk:1.2
        xf-3_3_3_1b:1.1.1.1.4.3
        xf-3_9Nva:1.2
        xf-3_9Ph-branch:1.2.0.4
        xf-3_9Pj:1.2
        xf-3_3_3_1a:1.1.1.1.4.3
        xf-3_9Pi:1.2
        xf-3_9Ph:1.2
        xf-3_9Pg:1.2
        xf-3_9Pf:1.2
        xf-3_9Pe:1.2
        xf-3_9Pd:1.2
        xf-3_9Pc:1.2
        xf-3_9Pb:1.2
        xf-3_9Pa:1.2
        xf-3_9P:1.2
        xf-3_9Nz:1.2
        xf-3_9Ny:1.2
        xf-3_9Nx:1.2
        xf-3_9Nw:1.2
        xf-3_9Nv-branch:1.2.0.2
        xf-3_9Nv:1.2
        xf-3_9Nu:1.2
        xf-3_9Nt:1.2
        xf-3331_shark:1.1.1.1.4.3.0.2
        xf-3_3_3_1:1.1.1.1.4.3
        xf-3_9Ns:1.2
        xf-3_3_3Z:1.1.1.1.4.3
        xf-3_3_3b:1.1.1.1.4.3
        xf-3_9Nr:1.2
        xf-3_3_3a:1.1.1.1.4.3
        xf-3_9Nq:1.1.1.1
        xf-3_9Np:1.1.1.1
        xf-3_9No:1.1.1.1
        xf-3_9Nn:1.1.1.1
        xf-3_3_2Zc:1.1.1.1.4.3
        xf-3_3_3:1.1.1.1.4.3
        xf-3_9Nm:1.1.1.1
        xf-3_3_2Zb:1.1.1.1.4.3
        xf-3_3_2Za:1.1.1.1.4.3
        xf-3_3_2Z:1.1.1.1
        xf-3_3_2j:1.1.1.1
        xf-3_3_2i:1.1.1.1
        xf-3_9Nl:1.1.1.1
        xf-3_3_2h:1.1.1.1
        xf-3_9Nk:1.1.1.1
        xf-3_3_2g:1.1.1.1
        xf-3_3_2f:1.1.1.1
        xf-3_9Nj:1.1.1.1
        xf-3_9Ni:1.1.1.1
        xf-3_3_2e:1.1.1.1
        xf-3_9Nh:1.1.1.1
        xf-3_3_2_4:1.1.1.1
        xf-3_3_2d:1.1.1.1
        X11R6-4_3:1.1.1.1
        X11R6-4_2:1.1.1.1
        X11R6-4_1:1.1.1.1
        X11R6-4_0:1.1.1.1
        xf-3_9Ng:1.1.1.1
        xf-3_9Nf:1.1.1.1
        xf-3_9Ne:1.1.1.1
        xf-3_3_2c:1.1.1.1
        xf-3_9Nd:1.1.1.1
        xf-3_9Nc:1.1.1.1
        xf-3_3_2b:1.1.1.1
        xf-3_9Nb:1.1.1.1
        xf-3_9Na:1.1.1.1
        xf-3_3_2a:1.1.1.1
        xf-3_9N:1.1.1.1
        xf-3_9jw:1.1.1.1
        xf-3_9jv:1.1.1.1
        xf-3_9ju:1.1.1.1
        xf-3_9jt:1.1.1.1
        xf-3_9Ak:1.1.1.1
        xf-3_3_2_3:1.1.1.1
        xf-3_9js:1.1.1.1
        xf-3_9Aj:1.1.1.1
        xf-3_9jr:1.1.1.1
        xf-3_9jq:1.1.1.1
        xf-3_9jp:1.1.1.1
        xf-3_9jo:1.1.1.1
        xf-3_9jn:1.1.1.1
        xf-3_9jm:1.1.1.1
        xf-3_9jl:1.1.1.1
        xf-3_9Ai:1.1.1.1
        xf-3_9jk:1.1.1.1
        xf-3_9jj:1.1.1.1
        xf-3_9ji:1.1.1.1
        xf-3_9jh:1.1.1.1
        xf-3_3_2_2:1.1.1.1
        xf-3_9jg:1.1.1.1
        xf-3_3_2_1:1.1.1.1
        xf-3_9Ah:1.1.1.1
        xf-3_9jf:1.1.1.1
        xf-3_9Ag:1.1.1.1
        xf-3_9Af:1.1.1.1
        xf-3_9Ae:1.1.1.1
        xf-3_3_2:1.1.1.1
        xf-3_3_1z:1.1.1.1
        xf-3_3_1g:1.1.1.1
        xf-3_3_1f:1.1.1.1
        xf-3_3_1e:1.1.1.1
        xf-3_3_1d:1.1.1.1
        xf-3_9je:1.1.1.1
        xf-3_3_1c:1.1.1.1
        xf-3_9jd:1.1.1.1
        xf-3_3_1b:1.1.1.1
        xf-3_9Ad:1.1.1.1
        xf-3_3_1a:1.1.1.1
        xf-3_9jc:1.1.1.1
        xf-3_9jb:1.1.1.1
        xf-3_9Ac:1.1.1.1
        xf-3_9Ab:1.1.1.1
        xf-3_9Aa:1.1.1.1
        xf-3_9z:1.1.1.1
        xf-3_9y:1.1.1.1
        xf-3_9x:1.1.1.1
        xf-3_9w:1.1.1.1
        xf-3_9v:1.1.1.1
        xf-3_9u:1.1.1.1
        xf-3_9t:1.1.1.1
        xf-3_9s:1.1.1.1
        xf-3_9r:1.1.1.1
        xf-3_9q:1.1.1.1
        xf-3_9p:1.1.1.1
        xf-3_9o:1.1.1.1
        xf-3_9n:1.1.1.1
        xf-3_9m:1.1.1.1
        xf-3_3_1:1.1.1.1
        xf-3_3g:1.1.1.1
        xf-3_3f:1.1.1.1
        xf-3_9l:1.1.1.1
        xf-3_9ja:1.1.1.1
        xf-3_9k:1.1.1.1
        xf-39ja:1.1.1.1
        xf-3_3e:1.1.1.1
        xf-3_3d:1.1.1.1
        xf-3_3c:1.1.1.1
        xf-3_3b:1.1.1.1
        xf-3_9j-branch:1.1.1.1.0.6
        xf-3_9j:1.1.1.1
        xf-3_3a:1.1.1.1
        xf-3_9i:1.1.1.1
        X11R6-3_2:1.1.1.1
        xf-3_9h:1.1.1.1
        xf-3_9g:1.1.1.1
        xf-3_9f:1.1.1.1
        xf-3_9e:1.1.1.1
        xf-3_9d:1.1.1.1
        xf-3_9c:1.1.1.1
        xf-3_3:1.1.1.1
        xf-3_2Zc:1.1.1.1
        xf-3_2Zb:1.1.1.1
        xf-3_2Za:1.1.1.1
        xf-3_2Z:1.1.1.1
        xf-3_2Xn:1.1.1.1
        xf-3_2Xm:1.1.1.1
        xf-3_2Xl:1.1.1.1
        xf-3_2Xk:1.1.1.1
        xf-3_2Xj:1.1.1.1
        xf-3_2Xi:1.1.1.1
        xf-3_2Xh:1.1.1.1
        xf-3_2Xg:1.1.1.1
        xf-3_2Xf:1.1.1.1
        xf-3_2Xe:1.1.1.1
        xf-3_2Xd:1.1.1.1
        xf-3_2Xc:1.1.1.1
        xf-3_2Xb:1.1.1.1
        xf-3_2Xa:1.1.1.1
        xf-3_9b:1.1.1.1
        xf-3_9a:1.1.1.1
        xf-3_2At:1.1.1.1
        xf-3_2A-branch:1.1.1.1.0.4
        xf-3_2As:1.1.1.1
        xf-3_2Ar:1.1.1.1
        xf-3_2Aq:1.1.1.1
        xf-3_2Ap:1.1.1.1
        xf-3_2Ao:1.1.1.1
        xf-3_2-p2:1.1.1.1
        xf-3_2An:1.1.1.1
        xf-3_2Am:1.1.1.1
        xf-3_2Al:1.1.1.1
        xf-3_2Ak:1.1.1.1
        xf-3_2Aj:1.1.1.1
        xf-3_2Ai:1.1.1.1
        xf-3_2Ah:1.1.1.1
        xf-3_2Ag:1.1.1.1
        xf-3_2Af:1.1.1.1
        xf-3_2Ae:1.1.1.1
        xf-3_2Ad:1.1.1.1
        xf-3_2Ac:1.1.1.1
        xf-3_2Ab:1.1.1.1
        xf-3_2Aa:1.1.1.1
        xf-3_2A:1.1.1.1
        xf-3_2y:1.1.1.1
        xf-3_2x:1.1.1.1
        xf-3_2w:1.1.1.1
        xf-3_2v:1.1.1.1
        xf-3_2u:1.1.1.1
        xf-3_2t:1.1.1.1
        xf-3_2s:1.1.1.1
        xf-3_2-p1:1.1.1.1
        xf-3_2-branch:1.1.1.1.0.2
        xf-3_2r:1.1.1.1
        xf-3_2q:1.1.1.1
        xf-3_2p:1.1.1.1
        xf-3_2o:1.1.1.1
        xf-3_2n:1.1.1.1
        xf-3_2m:1.1.1.1
        X11R6-3_1:1.1.1.1
        xf-3_2l:1.1.1.1
        seq-4321:1.1.1.1
        seq-4316:1.1.1.1
        xf-3_2k:1.1.1.1
        seq-4304:1.1.1.1
        xf-3_2j:1.1.1.1
        X11R6-3_0:1.1.1.1
        seq-4282:1.1.1.1
        xf-3_2i:1.1.1.1
        xf-3_2h:1.1.1.1
        xf-3_2g:1.1.1.1
        xf-3_2f:1.1.1.1
        xf-3_2e:1.1.1.1
        xf-3_2d:1.1.1.1
        xf-3_2c:1.1.1.1
        xf-3_2b:1.1.1.1
        xf-3_2a:1.1.1.1
        xf-3_2:1.1.1.1
        xf-3_1_2Zd:1.1.1.1
        xf-3_1_2Zc:1.1.1.1
        xf-3_1_2Zb:1.1.1.1
        xf-3_1_2Za:1.1.1.1
        xf-3_1_2Z:1.1.1.1
        xf-3_1_2Gq:1.1.1.1
        xf-3_1_2Gp:1.1.1.1
        xf-3_1_2Go:1.1.1.1
        xf-3_1_2Gn:1.1.1.1
        xf-3_1_2Gm:1.1.1.1
        xf-3_1_2Gl:1.1.1.1
        xf-3_1_2Gk:1.1.1.1
        xf-3_1_2Gj:1.1.1.1
        xf-3_1_2Gi:1.1.1.1
        xf-3_1_2Gh:1.1.1.1
        xf-3_1_2Gg:1.1.1.1
        xf-3_1_2Gf:1.1.1.1
        xf-3_1_2Ge:1.1.1.1
        xf-3_1_2Gd:1.1.1.1
        xf-3_1_2Gc:1.1.1.1
        xf-3_1_2Gb:1.1.1.1
        xf-3_1_2Ga:1.1.1.1
        xf-3_1_2G:1.1.1.1
        xf-3_1_2Fc:1.1.1.1
        xf-3_1_2Fb:1.1.1.1
        xf-3_1_2Fa:1.1.1.1
        xf-3_1_2F:1.1.1.1
        xf-3_1_2Eo:1.1.1.1
        xf-3_1_2En:1.1.1.1
        xf-3_1_2Em:1.1.1.1
        xf-3_1_2El:1.1.1.1
        xf-3_1_2Ek:1.1.1.1
        xf-3_1_2Ej:1.1.1.1
        xf-3_1_2Ei:1.1.1.1
        xf-3_1_2Eh:1.1.1.1
        xf-3_1_2Eg:1.1.1.1
        xf-3_1_2Ef:1.1.1.1
        xf-3_1_2Ee:1.1.1.1
        xf-3_1_2Ed:1.1.1.1
        xf-3_1_2Ec:1.1.1.1
        xf-3_1_2Eb:1.1.1.1
        xf-3_1_2Ea:1.1.1.1
        xf-3_1_2E:1.1.1.1
        xf-3_1_2Dj:1.1.1.1
        xf-3_1_2Di:1.1.1.1
        xf-3_1_2Dh:1.1.1.1
        xf-3_1_2Dg:1.1.1.1
        xf-3_1_2Df:1.1.1.1
        xf-3_1_2De:1.1.1.1
        xf-3_1_2Dd:1.1.1.1
        X11R6-1_1:1.1.1.1
        xf-3_1_2Dc:1.1.1.1
        xf-3_1_2Db:1.1.1.1
        xf-3_1_2Da:1.1.1.1
        xf-3_1_2D:1.1.1.1
        xf-3_1_2Ch:1.1.1.1
        xf-3_1_2Cg:1.1.1.1
        xf-3_1_2Cf:1.1.1.1
        xf-3_1_2Ce:1.1.1.1
        xf-3_1_2Cd:1.1.1.1
        xf-3_1_2Cc:1.1.1.1
        X11R6-1_0:1.1.1.1
        X11R6:1.1.1;
locks; strict;
comment @# @;


1.5
date    2001.06.04.21.12.16;    author dawes;   state Exp;
branches;
next    1.4;

1.4
date    2001.05.24.18.52.13;    author dawes;   state Exp;
branches;
next    1.3;

1.3
date    2001.01.17.16.57.40;    author dawes;   state Exp;
branches
        1.3.2.1;
next    1.2;

1.2
date    98.12.20.11.56.37;      author dawes;   state Exp;
branches;
next    1.1;

1.1
date    96.02.10.05.55.56;      author dawes;   state Exp;
branches
        1.1.1.1;
next    ;

1.1.1.1
date    96.02.10.05.55.56;      author dawes;   state Exp;
branches
        1.1.1.1.4.1;
next    1.1.1.2;

1.1.1.2
date    2001.01.16.21.58.57;    author dawes;   state Exp;
branches;
next    ;

1.1.1.1.4.1
date    98.11.07.04.42.26;      author dawes;   state Exp;
branches;
next    1.1.1.1.4.2;

1.1.1.1.4.2
date    98.11.08.09.06.31;      author dawes;   state Exp;
branches;
next    1.1.1.1.4.3;

1.1.1.1.4.3
date    98.11.08.11.49.16;      author hohndel; state Exp;
branches;
next    ;

1.3.2.1
date    2001.05.24.18.54.10;    author dawes;   state Exp;
branches;
next    1.3.2.2;

1.3.2.2
date    2001.06.04.21.11.31;    author dawes;   state Exp;
branches;
next    ;


desc
@@


1.5
log
@Fix rules/naming for generated X.Org RELNOTES and INSTALL docs so that
the installed versions don't get confused with the XFree86 ones.
@
text
@XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:05 cpqbld Exp $

XCOMM Format the documentation about the release as a whole.
XCOMM The files generated here are shipped in the top-level
XCOMM xc/ directory.

XCOMM $XFree86: xc/doc/misc/Imakefile,v 1.4 2001/05/24 18:52:13 dawes Exp $

MakeSimpleDoc(RELNOTES-X.org,RELNOTES.ms)

MakeSimpleDoc(INSTALL-X.org,INSTALL.ms)

/* the rules should be updated to generate .TXT extensions normally */

RELNOTES-X.org.TXT: RELNOTES-X.org.txt
        RemoveFile(RELNOTES-X.org.TXT)
        $(CP) RELNOTES-X.org.txt RELNOTES-X.org.TXT

INSTALL-X.org.TXT: INSTALL-X.org.txt
        RemoveFile(INSTALL-X.org.TXT)
        $(CP) INSTALL-X.org.txt INSTALL-X.org.TXT

clean::
        RemoveFiles(RELNOTES-X.org.TXT INSTALL-X.org.TXT)


TXTTARGETS = RELNOTES-X.org.TXT INSTALL-X.org.TXT

AllTarget($(TXTTARGETS))

#ifndef UpdateDocsInSource
#define UpdateDocsInSource NO
#endif

#if UpdateDocsInSource
SOURCETARGET = install
#else
SOURCETARGET = update
#endif

$(SOURCETARGET):: $(TXTTARGETS)
        $(CP) RELNOTES-X.org.TXT $(TOP)/RELNOTES-X.org
        $(CP) INSTALL-X.org.TXT $(TOP)/INSTALL-X.org

InstallRoffDoc(INSTALL-X.org)
InstallRoffDoc(RELNOTES-X.org)
@


1.4
log
@Fix the rule for updating the top level X.org RELNOTES and INSTALL docs.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/doc/misc/Imakefile,v 1.3 2001/01/17 16:57:40 dawes Exp $
d9 1
a9 1
MakeSimpleDoc(RELNOTES,RELNOTES.ms)
d11 1
a11 1
MakeSimpleDoc(INSTALL,INSTALL.ms)
d15 7
a21 5
RELNOTES.TXT: RELNOTES.txt
        $(MV) RELNOTES.txt RELNOTES.TXT

INSTALL.TXT: INSTALL.txt
        $(MV) INSTALL.txt INSTALL.TXT
d24 1
a24 1
        $(RM) RELNOTES.TXT INSTALL.TXT
d27 1
a27 1
  TARGETS = RELNOTES.PS RELNOTES.TXT INSTALL.PS INSTALL.TXT
d29 1
a29 1
AllTarget($(TARGETS))
d41 3
a43 3
$(SOURCETARGET):: $(TARGETS)
        $(CP) RELNOTES.TXT $(TOP)/RELNOTES-X.org
        $(CP) INSTALL.TXT $(TOP)/INSTALL-X.org
d45 2
a46 2
InstallRoffDoc(INSTALL)
InstallRoffDoc(RELNOTES)
@


1.3
log
@R6.5.1 merge for xc/doc
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/doc/misc/Imakefile,v 1.2 1998/12/20 11:56:37 dawes Exp $
d40 2
a41 1
        $(CP) $(TARGETS) $(TOP)
@


1.3.2.1
log
@Fix the rule for updating the top level X.org RELNOTES and INSTALL docs.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/doc/misc/Imakefile,v 1.3 2001/01/17 16:57:40 dawes Exp $
d40 1
a40 2
        $(CP) RELNOTES.TXT $(TOP)/RELNOTES-X.org
        $(CP) INSTALL.TXT $(TOP)/INSTALL-X.org
@


1.3.2.2
log
@Fix rules/naming for generated X.Org RELNOTES and INSTALL docs so that
the installed versions don't get confused with the XFree86 ones.
@
text
@d7 1
a7 1
XCOMM $XFree86: xc/doc/misc/Imakefile,v 1.3.2.1 2001/05/24 18:54:10 dawes Exp $
d9 1
a9 1
MakeSimpleDoc(RELNOTES-X.org,RELNOTES.ms)
d11 1
a11 1
MakeSimpleDoc(INSTALL-X.org,INSTALL.ms)
d15 5
a19 7
RELNOTES-X.org.TXT: RELNOTES-X.org.txt
        RemoveFile(RELNOTES-X.org.TXT)
        $(CP) RELNOTES-X.org.txt RELNOTES-X.org.TXT

INSTALL-X.org.TXT: INSTALL-X.org.txt
        RemoveFile(INSTALL-X.org.TXT)
        $(CP) INSTALL-X.org.txt INSTALL-X.org.TXT
d22 1
a22 1
        RemoveFiles(RELNOTES-X.org.TXT INSTALL-X.org.TXT)
d25 1
a25 1
TXTTARGETS = RELNOTES-X.org.TXT INSTALL-X.org.TXT
d27 1
a27 1
AllTarget($(TXTTARGETS))
d39 3
a41 3
$(SOURCETARGET):: $(TXTTARGETS)
        $(CP) RELNOTES-X.org.TXT $(TOP)/RELNOTES-X.org
        $(CP) INSTALL-X.org.TXT $(TOP)/INSTALL-X.org
d43 2
a44 2
InstallRoffDoc(INSTALL-X.org)
InstallRoffDoc(RELNOTES-X.org)
@


1.2
log
@initial 3.9Nr patches
@
text
@d1 1
a1 1
XCOMM $XConsortium: Imakefile /main/1 1996/02/01 00:56:19 gildea $
d7 1
a7 1
XCOMM $XFree86$
@


1.1
log
@Initial revision
@
text
@d7 2
d29 11
a39 1
install:: $(TARGETS)
d41 3
@


1.1.1.1
log
@X11R6.1 public patch 0
@
text
@@


1.1.1.2
log
@X11R6.5.1
@
text
@d1 1
a1 1
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:05 cpqbld Exp $
@


1.1.1.1.4.1
log
@Some conifg/build updates for building/installing some docs, and some bindist
updates
@
text
@a26 5
#ifndef UpdateDocsInSource
#define UpdateDocsInSource NO
#endif

#if UpdateDocsInSource
a28 4
#else
InstallRoffDoc(INSTALL)
InstallRoffDoc(RELNOTES)
#endif
@


1.1.1.1.4.2
log
@various doc/build/config updates
@
text
@d32 2
a33 1
SOURCETARGET = install
a34 6
SOURCETARGET = update
#endif

$(SOURCETARGET):: $(TARGETS)
        $(CP) $(TARGETS) $(TOP)

d37 1
@


1.1.1.1.4.3
log
@Id lines and FBDev fix
@
text
@a5 3
XCOMM
XCOMM $XFree86: $
XCOMM
@






reply via email to

[Prev in Thread] Current Thread [Next in Thread]