[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:42:45
[Download RAW message or body]

On Monday 18 November 2002 11:33 pm, Robert Collins wrote:
> Just use
>
> cvs -z3 up -Pdkk
>
> Then $ID: ...$ becomes
> $ID: $ and it will merge ok

It was more then that. 

Some (all?) files did not have an $Id$ tag, so it had to be added. To resolve 
the conflict.

Other has, as stated above, $ID .... $, those has to be converted. 

I couldn't find a way to do it all with cvs or rcs commands, so I brute-forced 
it with perl.

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