CVS question
Deron Johnson
Deron.Johnson at Sun.COM
Tue Sep 21 10:46:11 PDT 2004
Xavier Bestel wrote:
> Le mar 21/09/2004 à 00:18, Deron Johnson a écrit :
>
>>If I have a checked out copy of an xorg cvs repository, I can
>>use cvs status README to find out the branch for that repository.
>>But how can I find out the parent of that branch, the grandparent
>>etc. I've scoured the CVS documentation and I can't seem to find
>>anything that describes how to print out the topology of the
>>branch tree.
>
>
> cvs log README is not that bad.
>
> Xav
>
I tried that, and this is what I get. But how do I derive the branch
topology from this mess?
RCS file: /cvs/xorg/xc/README,v
Working file: README
head: 1.3
branch:
locks: strict
access list:
symbolic names:
lg3d-event: 1.3.0.10
lg3d-dev-0-6-1: 1.3.0.8
CYGWIN-6_8_1-MERGE: 1.3.6.2
CYGWIN-6_8_0-MERGE: 1.3.6.1
CYGWIN: 1.3.0.6
XORG-6_8_1: 1.3.2.2
lg3d: 1.3.0.4
lg3d-base: 1.3
XORG-6_8-branch: 1.3.0.2
XORG-6_8_0: 1.3
XORG-6_7_99_904: 1.2
XORG-6_7_99_903: 1.2
XORG-6_7_99_902: 1.2
XORG-6_7_99_901: 1.2
XORG-6_7_99_2: 1.2
XORG-6_7_99_1: 1.2
COMPOSITEWRAP: 1.2.0.4
XORG-CYGWIN-MERGE: 1.1.2.2
XACE-SELINUX-MERGE: 1.2
XACE-SELINUX: 1.2.0.2
XORG-CURRENT-CLOSED: 1.1.6.1
before_20040421_xprint_branch_landing: 1.1.6.1
XORG-CURRENT: 1.1.0.6
XORG-RELEASE-1-MERGE: 1.1.2.2
XPRINT_BEGIN: 1.1.4.1
XPRINT: 1.1.0.4
XORG-6_7_0: 1.1.2.1
xo-6_7_0: 1.1.2.2
XORG-RELEASE-1: 1.1.0.2
keyword substitution: kv
total revisions: 13; selected revisions: 13
description:
----------------------------
revision 1.3
date: 2004-09-03 23:41:20 +0000; author: kem; state: Exp; lines: +45 -51
branches: 1.3.2; 1.3.6;
* BUILD:
* README:
* RELNOTES:
* programs/Xserver/hw/xfree86/doc/BUILD:
* programs/Xserver/hw/xfree86/doc/DESIGN:
* programs/Xserver/hw/xfree86/doc/Install:
* programs/Xserver/hw/xfree86/doc/LICENSE:
* programs/Xserver/hw/xfree86/doc/OS2.Notes:
* programs/Xserver/hw/xfree86/doc/README:
* programs/Xserver/hw/xfree86/doc/README.DECtga:
* programs/Xserver/hw/xfree86/doc/README.Darwin:
* programs/Xserver/hw/xfree86/doc/README.I128:
* programs/Xserver/hw/xfree86/doc/README.LynxOS:
* programs/Xserver/hw/xfree86/doc/README.NetBSD:
* programs/Xserver/hw/xfree86/doc/README.OpenBSD:
* programs/Xserver/hw/xfree86/doc/README.SCO:
* programs/Xserver/hw/xfree86/doc/README.SiS:
* programs/Xserver/hw/xfree86/doc/README.Solaris:
* programs/Xserver/hw/xfree86/doc/README.XKB-Config:
* programs/Xserver/hw/xfree86/doc/README.XKB-Enhancing:
* programs/Xserver/hw/xfree86/doc/README.apm:
* programs/Xserver/hw/xfree86/doc/README.ati:
* programs/Xserver/hw/xfree86/doc/README.chips:
* programs/Xserver/hw/xfree86/doc/README.cyrix:
* programs/Xserver/hw/xfree86/doc/README.dps:
* programs/Xserver/hw/xfree86/doc/README.fonts:
* programs/Xserver/hw/xfree86/doc/README.i740:
* programs/Xserver/hw/xfree86/doc/README.i810:
* programs/Xserver/hw/xfree86/doc/README.mouse:
* programs/Xserver/hw/xfree86/doc/README.newport:
* programs/Xserver/hw/xfree86/doc/README.r128:
* programs/Xserver/hw/xfree86/doc/README.rendition:
* programs/Xserver/hw/xfree86/doc/README.s3virge:
* programs/Xserver/hw/xfree86/doc/RELNOTES:
* programs/Xserver/hw/xfree86/doc/Versions:
* programs/xkbcomp/README.config:
* programs/xkbcomp/README.enhancing:
Update formatted docs.
----------------------------
revision 1.2
date: 2004-04-23 18:41:44 +0000; author: eich; state: Exp; lines: +153 -0
branches: 1.2.2;
2004-04-23 Egbert Eich <eich at freedesktop.org>
Merging XORG-CURRENT into trunk
----------------------------
revision 1.1
date: 2004-04-06 21:16:07 +0000; author: keithp; state: dead;
branches: 1.1.2; 1.1.4; 1.1.6;
file README was initially added on branch XORG-RELEASE-1.
----------------------------
revision 1.1.6.1
date: 2004-04-15 10:12:53 +0000; author: eich; state: Exp; lines: +153 -0
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
----------------------------
revision 1.1.4.1
date: 2004-04-10 10:08:40 +0000; author: gisburn; state: Exp; lines:
+153 -0
Resync to 2004-04-10 XORG-RELEASE-1 branch (step 2: Adding missing files
and removing obsolete ones)
----------------------------
revision 1.1.2.2
date: 2004-04-07 04:03:47 +0000; author: keithp; state: Exp; lines:
+10 -36
2004-04-06 Keith Packard <keithp at keithp.com>
* BUILD:
* README:
* RELNOTES:
* programs/Xserver/hw/xfree86/doc/BUILD
* programs/Xserver/hw/xfree86/doc/DESIGN
* programs/Xserver/hw/xfree86/doc/Install
* programs/Xserver/hw/xfree86/doc/LICENSE
* programs/Xserver/hw/xfree86/doc/OS2.Notes
* programs/Xserver/hw/xfree86/doc/README
* programs/Xserver/hw/xfree86/doc/README.DECtga
* programs/Xserver/hw/xfree86/doc/README.Darwin
* programs/Xserver/hw/xfree86/doc/README.I128
* programs/Xserver/hw/xfree86/doc/README.LynxOS
* programs/Xserver/hw/xfree86/doc/README.NetBSD
* programs/Xserver/hw/xfree86/doc/README.OpenBSD
* programs/Xserver/hw/xfree86/doc/README.SCO
* programs/Xserver/hw/xfree86/doc/README.SiS
* programs/Xserver/hw/xfree86/doc/README.Solaris
* programs/Xserver/hw/xfree86/doc/README.XKB-Config
* programs/Xserver/hw/xfree86/doc/README.XKB-Enhancing
* programs/Xserver/hw/xfree86/doc/README.apm
* programs/Xserver/hw/xfree86/doc/README.ati
* programs/Xserver/hw/xfree86/doc/README.chips
* programs/Xserver/hw/xfree86/doc/README.cyrix
* programs/Xserver/hw/xfree86/doc/README.dps
* programs/Xserver/hw/xfree86/doc/README.fonts
* programs/Xserver/hw/xfree86/doc/README.i740
* programs/Xserver/hw/xfree86/doc/README.i810
* programs/Xserver/hw/xfree86/doc/README.mouse
* programs/Xserver/hw/xfree86/doc/README.newport
* programs/Xserver/hw/xfree86/doc/README.r128
* programs/Xserver/hw/xfree86/doc/README.rendition
* programs/Xserver/hw/xfree86/doc/README.s3virge
* programs/Xserver/hw/xfree86/doc/RELNOTES
* programs/Xserver/hw/xfree86/doc/Versions
Update formatted docs
----------------------------
revision 1.1.2.1
date: 2004-04-06 21:16:07 +0000; author: keithp; state: Exp; lines:
+179 -0
2004-04-06 Keith Packard <keithp at keithp.com>
* BUILD:
* README:
* RELNOTES:
* config/cf/lnxdoc.rules:
* config/cf/lnxdoc.tmpl:
* programs/Xserver/hw/xfree86/doc/BUILD:
* programs/Xserver/hw/xfree86/doc/DESIGN:
* programs/Xserver/hw/xfree86/doc/Install:
* programs/Xserver/hw/xfree86/doc/LICENSE:
* programs/Xserver/hw/xfree86/doc/OS2.Notes:
* programs/Xserver/hw/xfree86/doc/README:
* programs/Xserver/hw/xfree86/doc/README.DECtga:
* programs/Xserver/hw/xfree86/doc/README.Darwin:
* programs/Xserver/hw/xfree86/doc/README.I128:
* programs/Xserver/hw/xfree86/doc/README.LynxOS:
* programs/Xserver/hw/xfree86/doc/README.NetBSD:
* programs/Xserver/hw/xfree86/doc/README.OpenBSD:
* programs/Xserver/hw/xfree86/doc/README.SCO:
* programs/Xserver/hw/xfree86/doc/README.SiS:
* programs/Xserver/hw/xfree86/doc/README.Solaris:
* programs/Xserver/hw/xfree86/doc/README.XKB-Config:
* programs/Xserver/hw/xfree86/doc/README.XKB-Enhancing:
* programs/Xserver/hw/xfree86/doc/README.apm:
* programs/Xserver/hw/xfree86/doc/README.ati:
* programs/Xserver/hw/xfree86/doc/README.chips:
* programs/Xserver/hw/xfree86/doc/README.cyrix:
* programs/Xserver/hw/xfree86/doc/README.dps:
* programs/Xserver/hw/xfree86/doc/README.fonts:
* programs/Xserver/hw/xfree86/doc/README.i740:
* programs/Xserver/hw/xfree86/doc/README.mouse:
* programs/Xserver/hw/xfree86/doc/README.newport:
* programs/Xserver/hw/xfree86/doc/README.r128:
* programs/Xserver/hw/xfree86/doc/README.rendition:
* programs/Xserver/hw/xfree86/doc/README.s3virge:
* programs/Xserver/hw/xfree86/doc/RELNOTES:
* programs/Xserver/hw/xfree86/doc/Versions:
* programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml:
Add 'BUILD' and 'README' to top level.
Fix Id lines in generated documentation to reference
source document.
----------------------------
revision 1.2.2.1
date: 2004-05-04 19:40:57 +0000; author: ewalsh; state: Exp; lines: +0 -0
Merge the new release from HEAD
----------------------------
revision 1.3.6.3
date: 2004-09-17 16:26:50 +0000; author: ago; state: Exp; lines: +23 -27
Pull in XORG-6_8_1
----------------------------
revision 1.3.6.2
date: 2004-09-17 08:58:19 +0000; author: ago; state: Exp; lines: +25 -21
Import XORG-6_8_1 to CYGWIN branch
----------------------------
revision 1.3.6.1
date: 2004-09-15 16:31:13 +0000; author: ago; state: Exp; lines: +1 -1
Pull XORG-6_8_0 to CYGWIN branch
----------------------------
revision 1.3.2.2
date: 2004-09-17 15:38:17 +0000; author: kem; state: Exp; lines: +24 -28
* config/cf/xorg.cf:
Update the XORG_DATE for the release.
* config/cf/cygwin.cf:
Update cygwin release version.
* BUILD:
* README:
* RELNOTES:
* programs/Xserver/hw/xfree86/doc/BUILD:
* programs/Xserver/hw/xfree86/doc/DESIGN:
* programs/Xserver/hw/xfree86/doc/Install:
* programs/Xserver/hw/xfree86/doc/OS2.Notes:
* programs/Xserver/hw/xfree86/doc/README:
* programs/Xserver/hw/xfree86/doc/README.DECtga:
* programs/Xserver/hw/xfree86/doc/README.Darwin:
* programs/Xserver/hw/xfree86/doc/README.LynxOS:
* programs/Xserver/hw/xfree86/doc/README.NetBSD:
* programs/Xserver/hw/xfree86/doc/README.OpenBSD:
* programs/Xserver/hw/xfree86/doc/README.SCO:
* programs/Xserver/hw/xfree86/doc/README.SiS:
* programs/Xserver/hw/xfree86/doc/README.Solaris:
* programs/Xserver/hw/xfree86/doc/README.XKB-Config:
* programs/Xserver/hw/xfree86/doc/README.chips:
* programs/Xserver/hw/xfree86/doc/README.dps:
* programs/Xserver/hw/xfree86/doc/README.fonts:
* programs/Xserver/hw/xfree86/doc/README.i740:
* programs/Xserver/hw/xfree86/doc/README.i810:
* programs/Xserver/hw/xfree86/doc/README.mouse:
* programs/Xserver/hw/xfree86/doc/README.r128:
* programs/Xserver/hw/xfree86/doc/README.rendition:
* programs/Xserver/hw/xfree86/doc/README.s3virge:
* programs/Xserver/hw/xfree86/doc/RELNOTES:
* programs/Xserver/hw/xfree86/doc/Versions:
* programs/Xserver/hw/xfree86/doc/sgml/defs.ent:
* programs/xkbcomp/README.config:
Update documentation for release.
----------------------------
revision 1.3.2.1
date: 2004-09-15 15:47:36 +0000; author: daniel; state: Exp; lines:
+25 -21
2004-09-15 Daniel Stone <daniel at freedesktop.org>
* xc/extras/Xpm/lib/Attrib.c:
* xc/extras/Xpm/lib/CrDatFrI.c:
* xc/extras/Xpm/lib/WrFFrI.c:
* xc/extras/Xpm/lib/XpmI.h:
* xc/extras/Xpm/lib/create.c:
* xc/extras/Xpm/lib/data.c:
* xc/extras/Xpm/lib/hashtab.c:
* xc/extras/Xpm/lib/parse.c:
* xc/extras/Xpm/lib/scan.c:
* xc/lib/Xpm/Imakefile:
Merge patch from Mathieu Herrb to fix several integer overflows and
other security errors in libXpm.
=============================================================================
More information about the xorg
mailing list