[cvsnt] Re: conflicts while importing vendor branch?

[Andy Southby]

Richard,

Check some of the files reporting the conflicts for keywords that are being 
expanded. I am new to CVSNT but seem to remember reading (possibly in the 
CVSNT manual or "Open Source Development with CVS 3rd ed") that care should 
be taken with the use of keywords as they can lead to conflicts.

If this is the case then it might be worth switching off the keyword 
expansion for your thirdparty imports.

I hope this helps.

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
>