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

strange behavior with svn revert

From: Sebastien LEDUC <sebastien.leduc_at_st.com>
Date: 2005-11-10 12:13:05 CET

I have two branches A and B.
the same file "myfile" has been added in both branches with svn add / commit

Then I have merged branch A into branch B:

svn merge B_url A_url B_working_copy
D myfile
A myfile

Since myfile has been added in both branches, it is deleted then added
by the merge command.

Then I use svn revert on myfile to undo the merge:

svn revert myfile
Reverted 'myfile'

After that, I get the following error message if I try to commit the
files modified by the merge:

svn: Commit failed (details follow):
svn: Commit item
'/home/leducs/Work_V90/mmdspcc/.svnbranchtmp/parent/myfile' has copy
flag but no copyfrom URL

Now if I run svn status on that file, I get the following output:

svn status -v myfile
   + - 253 leducs myfile

Is it a bug of the revert command, or did I miss something?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 10 12:22:38 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.