For the past couple months, I have been getting the following conflicts
whenever I do
an update on avalon-excalibur. I assumed that it was a work in progress
and would
be resolved. But the problem never went away. It is being caused because the
meta information files are being modified by the build and also checked
in by other
users. Because the files are checked in as binary files, CVS is unable
to do a
clean merge and detect that they have not actually changed. Do these
files really
need to be in CVS? If so, then the build should probably be modified so
that CVS
versions are used rather than locally built versions.
Also, all of these files appear to be valid text files. Is there any
reason why they could
not be checked in as text files?
Cheers,
Leif
cvs server: Updating sourceresolve/examples
cvs server: Updating sourceresolve/src
cvs server: Updating sourceresolve/src/conf
cvs server: Updating sourceresolve/src/fortress.meta
cvs update: move away sourceresolve/src/fortress.meta/services.list; it
is in the way
C sourceresolve/src/fortress.meta/services.list
cvs server: Updating sourceresolve/src/fortress.meta/META-INF
cvs server: Updating sourceresolve/src/fortress.meta/META-INF/services
cvs update: move away
sourceresolve/src/fortress.meta/META-INF/services/org.apache.excalibur.source.SourceFactory;
it is in the way
C
sourceresolve/src/fortress.meta/META-INF/services/org.apache.excalibur.source.SourceFactory
cvs update: move away
sourceresolve/src/fortress.meta/META-INF/services/org.apache.excalibur.source.SourceResolver;
it is in the way
C
sourceresolve/src/fortress.meta/META-INF/services/org.apache.excalibur.source.SourceResolver
cvs server: Updating sourceresolve/src/fortress.meta/org
cvs server: Updating sourceresolve/src/fortress.meta/org/apache
cvs server: Updating sourceresolve/src/fortress.meta/org/apache/excalibur
cvs server: Updating
sourceresolve/src/fortress.meta/org/apache/excalibur/source
cvs server: Updating
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl
cvs update: move away
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/FileSourceFactory.meta;
it is in the way
C
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/FileSourceFactory.meta
cvs update: move away
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/ResourceSourceFactory.meta;
it is in the way
C
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/ResourceSourceFactory.meta
U
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/SourceResolverImpl.deps
cvs update: move away
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/SourceResolverImpl.meta;
it is in the way
C
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/SourceResolverImpl.meta
cvs update: move away
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/URLSourceFactory.meta;
it is in the way
C
sourceresolve/src/fortress.meta/org/apache/excalibur/source/impl/URLSourceFactory.meta
cvs server: Updating sourceresolve/src/java
cvs server: Updating sourceresolve/src/java/org
cvs server: Updating sourceresolve/src/java/org/apache
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
