On 11/10/05, Sebastien LEDUC <sebastien.leduc@st.com> wrote:
> Hi,
> 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?
>
There have been bugs related to this behavior, but I believe they've
been fixed in 1.3. What version are you using?
Josh
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 11 03:36:02 2005