You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Tom Browder <to...@gmail.com> on 2009/05/01 15:02:19 UTC

Re: Unable to Resolve Tree Conflict, v1.6.1 [SOLVED]

On Fri, May 1, 2009 at 09:43, Tom Browder <to...@gmail.com> wrote:
> Somehow I got a working directory messed up.  I have a file that I
> tried to 'svn mv' and now I can't update it or remove it:
>
> $ svn update --accept=base array_constructor_test1.f
> At revision 78.
> $ svn ci -m"update"
> Adding         gfortran_pgf77_sun_g95_tests/array_constructor_test1.f
> Deleting       gfortran_pgf77_sun_g95_tests/array_constructor_test1.f.save
> svn: Commit failed (details follow):
> svn: File '/gfortran_pgf77_sun_g95_tests/array_constructor_test1.f' is
> out of date

Well, I read http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2015144
and followed that advice.

I renamed the offending direcory, updated its parent, diffed the two ,
made my updates, and removed the reenamed directory.

All is well!

Thanks.

Regards,

-Tom

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2015603

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].