qt 3.1 port planing

[Bob Tanner]

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.=20

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

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

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

--=20
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!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288