qt 3.1 port planing

[Ralf Habacker]

> -----Original Message-----
> From: kde-cygwin-admin@mail.kde.org
> [mailto:kde-cygwin-admin@mail.kde.org]On Behalf Of Bob Tanner
> Sent: Tuesday, December 03, 2002 11:17 PM
> To: kde-cygwin@mail.kde.org
> Subject: Re: qt 3.1 port planing
>
>
> On Tuesday 26 November 2002 06:24 pm, Ralf Habacker wrote:
> > If you don't know how to, see below.
> >
> > $cd <your qt-3-snapshot>
> > $cvs import -m "QT 3.1.0 rc2 Release" qt-3 QT_IMPORT qt_3_1_0_rc2
> >
>
> I these cvs commit (see post to list from cvs). I get the following error:
>
> Connection to cvs.kde-cygwin.sourceforge.net closed by remote host.
> cvs [import aborted]: end of file from server (consult above messages if any)
>
The cvs commit mail does not show any error.

> And there are several conflicts (as shown in the cvs commit email).

These conflicts indicates changes in the relating files which have to be merged
in into the target trunk in our example QT_CYGWIN_3_1_BRANCH

Ralf