enami tsugutomo <enami@but-b.or.jp> writes:

> Since cvs doesn't compare the contents of HEAD revision and now
> importing revison,

Sorry, this sentense doesn't make sense.  It should be read as
`doesn't compare between the contents of previous of HEAD revision and
of previously imported version'.

Anyway, once you bring some file into main trunk, all the change made
in vender branch should be merged, even to keep the version in trunk
same as the one in vender branch.  So it is conflicted, isn't it?

enami.