[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn stat on new files

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2002-12-09 03:42:33 CET

On Sunday, December 8, 2002, at 09:31 PM, Martin Pool wrote:

> On Mon, 09 Dec 2002 13:09:13 +1100, Martin Pool wrote:
>
>> Following on from this, I thought I would experiment with resolving a
>> conflict between two simultaneously-added files.
>
> Incidentally, I couldn't work out any way to recover that wc to a
> working state. Whatever I tried, I couldn't get the file "added" to
> reappear, despite svn insisting that it was up-to-date. reverting it
> did not make it reappear, and trying to explicitly update it gives:
>
> % svn up added
> svn: Can't find an entry
> svn: svn_wc_is_wc_root: added is not a versioned resource
>
> I discarded the wc and got a new checkout and everything was fine.

i believe you could do an 'svn revert added' to revert your add, then
do an 'svn up' to get the new version.

the real issue is that 'svn up' probably should have errored out even
though the file was moved, since the 'added' state was still registered
in the working copy.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 9 03:43:13 2002

This is an archived mail posted to the Subversion Dev mailing list.