Inconsistent svn cp error messages and behaviour, recovering to earlier revision doesn't work

[Harri Järvi <ha...@tut.fi>]

Hello,

I'm using svn version 1.2.3 (r15833).

Reverting to an earlier revision of a file doesn't work. And there are
inconsistent error messages when trying to do so.

The following is an excerpt of what goes on:

1$ svn rm file.txt
D         file.txt

2$ svn cp -r 349 svn+ssh://host/repository/trunk/file.txt file.txt
svn: Entry for 'build.xml' exists (though the working file is missing)

3$ svn cp file2.txt file.txt
svn: 'build.xml' is scheduled for deletion; it must be committed before
being overwritten

4$ svn add file.txt
svn: 'file.txt' not found

5$ touch file.txt

6$ svn add file.txt
A         file.txt


The error messages in 2$ and 3$ are different. The error messages are
inconsistent.

Adding a new file in 6$ works and there is no error message, but copying
from an earlier revision or another file (2$ and 3$) leads to error 
messages. This is incosistent behaviour.

Why isn't recovering to (copying from) an earlier revision possible 
within one revision? Is it a good idea to require a "svn commit" in 
between of steps 1$ and 2$. This leads to an unwanted intermediate
revision with the file missing?

Is this a bug?

Yours,
Harri Järvi

Please Cc me.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Inconsistent svn cp error messages and behaviour, recovering to earlier revision doesn't work

[Erik Huelsmann <eh...@gmail.com>]

On 9/5/06, Harri Järvi <ha...@tut.fi> wrote:
> Hello,
>
> I'm using svn version 1.2.3 (r15833).
>
> Reverting to an earlier revision of a file doesn't work. And there are
> inconsistent error messages when trying to do so.
>
> The following is an excerpt of what goes on:
>
> 1$ svn rm file.txt
> D         file.txt
>
> 2$ svn cp -r 349 svn+ssh://host/repository/trunk/file.txt file.txt
> svn: Entry for 'build.xml' exists (though the working file is missing)
>
> 3$ svn cp file2.txt file.txt
> svn: 'build.xml' is scheduled for deletion; it must be committed before
> being overwritten
>
> 4$ svn add file.txt
> svn: 'file.txt' not found
>
> 5$ touch file.txt
>
> 6$ svn add file.txt
> A         file.txt
>
>
> The error messages in 2$ and 3$ are different. The error messages are
> inconsistent.
>
> Adding a new file in 6$ works and there is no error message, but copying
> from an earlier revision or another file (2$ and 3$) leads to error
> messages. This is incosistent behaviour.
>
> Why isn't recovering to (copying from) an earlier revision possible
> within one revision? Is it a good idea to require a "svn commit" in
> between of steps 1$ and 2$. This leads to an unwanted intermediate
> revision with the file missing?
>
> Is this a bug?

Maybe, maybe not, but it was a problem with the working copy library
not being able to represent 'replace-with-history'. This has (amongst
many other WC library improvements) been fixed in the upcoming 1.4.

HTH,

Erik.

RE: Inconsistent svn cp error messages and behaviour, recovering to earlier revision doesn't work

[Gavin Lambert <ga...@compacsort.com>]

Quoth Harri Järvi <ma...@tut.fi>:
> Reverting to an earlier revision of a file doesn't work. And
> there are inconsistent error messages when trying to do so.
> 
> The following is an excerpt of what goes on:
> 
> 1$ svn rm file.txt
> D         file.txt
> 
> 2$ svn cp -r 349 svn+ssh://host/repository/trunk/file.txt file.txt
> svn: Entry for 'build.xml' exists (though the working file is missing)

Isn't it better to to a reverse-merge to revert to an earlier version of
a file?

Mind you, then it shows up in the log as a local modification, not a
delete-and-copy.  But it's easy enough to add a suitable comment.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org