[mythtv] CVS "move away XXX; it is in the way" weirdness?

[Joseph A. Caputo]

On Wednesday 22 September 2004 21:27, Nigel Pearson wrote:
> % cvs update
> ? libs/libmyth/audiooutputca.cpp
> ? libs/libmyth/audiooutputca.h
> ...
> cvs update: Updating libs/libmyth
> cvs update: move away libs/libmyth/audiooutputca.cpp; it is in the
> way C libs/libmyth/audiooutputca.cpp
> cvs update: move away libs/libmyth/audiooutputca.h; it is in the way
> C libs/libmyth/audiooutputca.h
>
>
> 	In the way? WTF?

This could likely have happened if:

1. you created this file outside of CVS control
2. someone else added the file (or an identically-named file) to the 
main CVS repository (i.e., you submitted it as a new file in a patch 
and someone else committed it)
3. now, you do a 'cvs update' and CVS discovers there is a new file in 
the main repository named libs/libmyth/audiooutputca.cpp, which wasn't 
there the last time it checked.  It tries to fetch the new file from 
CVS, but it can't create it without clobbering a file of the same name 
that is not currently under its control, so it complains (rather than 
just blindly overwriting the file).

You should:

1. temporarily rename the offending files to something non-conflicting
2. cvs update
3. determine how you want to proceed... do your versions completely 
supersede CVS, or does CVS completely supersede your version?  Do you 
need to diff them and patch pieces?

*or*

you could try doing a 'cvs add' on the offending files.  Theoretically, 
this would give them entries in the CVS/Entries file for that 
directory, with a version of 0.0.  Then cvs should behave OK when you 
'cvs update'.  Note that you cannot do 'cvs add' on a new directory 
unless you have write privileges to the main repository, but adding 
files in an existing CVS directory should be OK (a quirk of the way CVS 
works).  The benefit of doing it this way (if it works) is that any 
changes should be merged correctly.  Just make sure you back them up 
before trying this.

HTH,

JAC