[cvsnt] Re: conflicts while importing vendor branch?

[Andy Southby]

Richard,

Check the top of page 167 "Open Source Development with CVS 3rd ed" you may 
want to read this section on importing.

You may also want to check the CVSNT Manual, do a search for $Log$.

Regards,
Andy.

"Richard Wirth" <richard at wirthware.de> wrote in message 
news:mailman.15.1125658150.1315.cvsnt at cvsnt.org...
>
> can anybody please explain?
>
> When I import the second version of a third party source, I get lots
> of conflicts. How is that possible?
>
> first import command:
> cvs import -d project vendor rel_1
>
> second import command
> cvs import -d project vendor rel_2
>
> 91 conficts created by this import.
>
>
>
> cvsnt version 2.5.02.2067 (linux server/windows client)
>
> -- 
> Best regards,
> Richard                          mailto:richard at wirthware.de
>