This is the mail archive of the mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

subversion trouble (was Re: Incorrect default options for h8300target)

On Tue, 2005-11-15 at 01:11, Jim Blandy wrote:
> 'svn revert' doesn't work for you?  What does 'svn status' say?

aretha$ svn revert tree-vrp.c
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for
aretha$ svn cleanup
svn: In directory '.'
svn: Can't copy '.svn/tmp/text-base/tree-vrp.c.svn-base' to
'tree-vrp.c.8.tmp': No such file or directory

The .svn/tmp/text-base/tree-vrp.c.svn-base file does not exist. 
tree-vrp.c is the file that I got the merge error for because my
external diff3 program was broken.  However, I don't understand why it
tried to do a merge, as I don't have any local patches for this file.

svn status for this file doesn't say anything.  svn status in the gcc
dir tells me that it is locked.
aretha$ svn status
?      tree-vrp.c.2.tmp
?      tree-vrp.c.tmp
?      tree-vrp.c.3.tmp
?      tree-vrp.c.4.tmp
?      tree-vrp.c.5.tmp
?      tree-vrp.c.6.tmp
?      tree-vrp.c.7.tmp
?      tree-vrp.c.8.tmp
?      dwarf2out.c.orig
?      tree-vrp.c.9.tmp
! L    .
M      tree-inline.c
?      config/ia64/tmp.file
?      config/h8300/patch.h8300.target_default
M      config/h8300/h8300.c

I'm using the prerelease subversion that Dan Berlin pointed us at.

Immediately after the merge/diff3 failed, I was getting checksum errors
for the .svn/test-base/tree-vrp.c.svn-base file.  I didn't see anything
in the FAQ about this.  I fumbled around a bit, trying various commands
including "svn resolved tree-vrp.c".  At some point, the checksum error
went away.  I don't know what I did to make it go away.  It was around
this time that I started getting the message about a locked working
copy, and this one I did find in the FAQ, but svn cleanup failed the
first time I tried it.

On the positive side, I've learned a bit about how subversion works, and
I finally started reading the manual.  Next time I have a problem, I
will be much better able to handle it.
Jim Wilson, GNU Tools Support,

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]