Re: Unable to Resolve Tree Conflict, v1.6.1

On May 1, 2009, at 09:43, Tom Browder 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

Have you tried "svn update"ing array_constructor_test1.f.save, or the
entire gfortran_pgf77_sun_g95_tests directory?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-01 17:04:32 CEST