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

List:       kde-cygwin
Subject:    Re: qt 3.1 port planing
From:       Bob Tanner <tanner () real-time ! com>
Date:       2002-11-19 5:31:46
[Download RAW message or body]

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. :-)

-- 
Bob Tanner <tanner@real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
http://www.linuxjustworks.com             | Linux Just Works!         
Key fingerprint = AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288
_______________________________________________
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]