This is the mail archive of the
cygwin-xfree@cygwin.com
mailing list for the Cygwin XFree86 project.
Re: Xoncygwin updates very slow at appearing
On Fri, 19 Sep 2003, Igor Pechtchanski wrote:
> On Fri, 19 Sep 2003, Colin Harrison wrote:
>
> > Hi,
> >
> > I don't get it:-
> >
> > cvs log -r 1.2 shm.c
> > cvspserver server: nothing known about 1.2
> >
> > RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/Xext/shm.c,v
> > Working file: shm.c
> > head: 1.1
> > branch: 1.1.1
> ^^^^^^^^^^^^^
> > revision 1.1.1.2
> > date: 2003/06/03 11:08:23; author: ago; state: Exp; lines: +54 -1
> > Import of XFree86 4.3.0 (second try)
> > ============================================================================
> >
> Perhaps you being on a branch (see the line above underlined with '^^^')
> has something to do with this? Alexander's log didn't contain that.
The import from XFree 4.3.0 was into the so called "vendor branch" which has
the branch number 1.1.1. My commit went to head and is therefore labelled 1.2
The order of latest revisions of shm.c are
1.1 (initial commit) (branch HEAD)
1.1.1.1 (import of XFree 4.2) (branch 1.1.1)
1.1.1.2 (import of XFree 4.3) (branch 1.1.1)
1.2 (commit from yesterday) (branch HEAD)
if we would have made changes between 4.2 and 4.3 the revisions would have been
1.1 (initial commit)
1.1.1.1 (import of XFree 4.2)
1.2 (some changes)
1.1.1.2 (import of XFree 4.3, including the canges between 1.1.1.1 and 1.2)
1.3 (latest changes)
The vendor branch is a complicated thing esp when it comes to importing sources
(eg XFree 4.4) and having already done changes to the files.
bye
ago
--
Alexander.Gottwald@s1999.tu-chemnitz.de
http://www.gotti.org ICQ: 126018723