[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-cygwin
Subject:    RE: qt 3.1 port planing
From:       "Ralf Habacker" <Ralf.Habacker () freenet ! de>
Date:       2002-11-19 8:55:26
[Download RAW message or body]



> -----Original Message-----
> From: kde-cygwin-admin@mail.kde.org
> [mailto:kde-cygwin-admin@mail.kde.org]On Behalf Of Bob Tanner
> Sent: Tuesday, November 19, 2002 6:32 AM
> To: kde-cygwin@mail.kde.org
> Subject: Re: qt 3.1 port planing
>
>
> On Saturday 16 November 2002 02:25 am, Ralf Habacker wrote:
> > 2. Then the cvs merging problems has to be fixed. One often problem is,
> > that the kde-cygwin sources uses $ID:$,
> > the qt-copy from kde does not, so that the merge produces conflicts like
> > this.
> >
> > <<<<<<< qclipboard.cpp
> > ** $Id: qclipboard.cpp,v 1.2 2002/06/08 17:44:20 atomice Exp $
> > =======
> > **
> >
> > >>>>>>> 1.1.1.3
> >
> > This has fixed into
> >
> > ** $Id: qclipboard.cpp,v 1.2 2002/06/08 17:44:20 atomice Exp $
> >
> > Does anyone have a perl (-e) script for this or does anyone know a better
> > solutions perhaps on the update command let me know. Then this must be
> > checked in on top of the QT_CYGWIN_3_1_BRANCH branch.
>
> Had an irc conversation with our LUG's perl guru and hammered out a script to
> fix the above.
>
> How would you like me to submit the patch. It's pretty large :-) and I don't
> think posting to the list is appropriate, unless that is what you want.
>
> I do have an SF account, if you trust me enough to commit the changes. :-)
>
Please do it, one question:  there are several SF account with the name tanners
but nonone with 'bob'; which account is yours ?

User Name Real Name
achieva Roger Tanner
ahto Ahto Tanner
alftanner Heinz Klümper
amytanner Amy Tanner
andianta Andreas Tannert
andytanner Andy Tanner
annie6 Dianne Tanner
cadatone Cecelia Tanner
chezstik Brian Tanner
cstanners Colin Stanners
ctanner Chris Tanner
cwtanner Cameron Tanner
danyt Daniel Tanner
darwin_soft Courtney Tanner
dctanner Damien Tanner
dtanner Dan Tanner
dumplechan Stephen Tanner
ertanner Eric Tanner
fastclam Carl Tanner
fine09 Gord Tanner
flash4u Helmut Obertanner
ftanner Frank Tanner III
gameproxy John Tanner
geeeza Ben Tanner
gigacomp Jonathan Tanner

Ralf

_______________________________________________
kde-cygwin mailing list
kde-cygwin@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-cygwin
[prev in list] [next in list] [prev in thread] [next in thread]