[cvsnt] Re: Import generates conflict messages, why???

[Bo Berglund]

But doing commit from a sandbox destroys the original file dates....

/Bo


-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org]On Behalf
Of Tony Hoyle
Sent: den 23 november 2004 13:18
To: cvsnt at cvsnt.org
Subject: [cvsnt] Re: Import generates conflict messages, why???


Bo Berglund wrote:
> I am testing how to get existing unix sources into cvs with things like file dates intact.
> So I am using cvs import (from WinCvs) to repeatedly import file sets into the same
> module on the server. The file sets are source versions kept in separate folders in
> the original development computer. Each folder contains both modified and unmodified
> files as compared to the previous version.
> 
> What I tried is this:
> 1) Import the first folder into a new module.
>    I used the option to use the filedate as the date of import and I did not create
>    any vendor branch etc.

That's your problem - you can't do a repeated import on a source tree 
without a vendor branch, as the merging that import does depends on it 
(it's an assumption that can't be easily removed either).

> So why is CVSNT sending this conflict message? The files are simply edited and there is
> a new revision to put into CVS only, this should not trigger a conflict, should it???

If you're not using vendor branches then just copy the files over the 
top and use commit/add/remove.

Tony
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt