> From: Anthony Metcalf [mailto:anthony.metcalf@anferny.ath.cx]
>
> Below is a transcipt of a session I just ran.
>
> cron.mrtg is a directory, which I have added to version control.
>
> What does the '?' mean in this context, and am I getting some sort of
> error?
>
> I am running subversion-1.1.3
>
>
> Gentoo etc # svn st
> ? cron.mrtg
> M cups/certs/0
> M ld.so.cache
> Gentoo etc # svn add cron.mrtg
> svn: warning: 'cron.mrtg' is already under version control
> Gentoo etc # svn ci -m"Updated world"
> Sending cups/certs/0
> Sending ld.so.cache
> Transmitting file data ..
> Committed revision 106.
> Gentoo etc # svn up
> At revision 106.
> Gentoo etc # svn st
> ? cron.mrtg
>
When I get this sort of problem, it is because cron.mrtg has been added *in
another WC*. So Subversion sees that it needs to update the directory by
installing a copy of cron.mrtg from the repository, but it also sees that
you already have a file named cron.mrtg in the directory.
Of course, if the two were identical, it should be able to "merge these
changes", but it does not. This is a known problem, I'm told.
Dale
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 22 17:11:57 2005