[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-16 20:59:09
[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.

Did you fix all of these in branch?

I just did a check out of QT_CYGWIN_3_1_BRANCH and I find no files with $ID:$ 
in them.

Does the conflict now show until you do the -j ?


-- 
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]