From kde-cygwin  Tue Nov 19 05:33:54 2002
From: "Robert Collins" <robert.collins () syncretize ! net>
Date: Tue, 19 Nov 2002 05:33:54 +0000
To: kde-cygwin
Subject: Re: qt 3.1 port planing
X-MARC-Message: https://marc.info/?l=kde-cygwin&m=103768404528523


===
----- Original Message -----
From: "Bob Tanner" <tanner@real-time.com>
To: <kde-cygwin@mail.kde.org>
Sent: Tuesday, November 19, 2002 4:31 PM
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 $

Just use

cvs -z3 up -Pdkk

Then $ID: ...$ becomes
$ID: $ and it will merge ok
Rob

_______________________________________________
kde-cygwin mailing list
kde-cygwin@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-cygwin