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

Re: Unnecessary conflicts?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-03-08 07:01:02 CET

Tim Moloney <moloney@mrsl.com> writes:

> bash> svn commit
> Adding /home/moloney/sandbox/example/dir1
> Adding /home/moloney/sandbox/example/dir1/file1
> Adding /home/moloney/sandbox/example/dir2
> Adding /home/moloney/sandbox/example/dir2/file2
> Adding /home/moloney/sandbox/example/dir3
> Adding /home/moloney/sandbox/example/dir3/file3
> Adding /home/moloney/sandbox/example/file1
> Adding /home/moloney/sandbox/example/file2
> Adding /home/moloney/sandbox/example/file3
> Committed revision 1.
> bash> cp ~/.bashrc file4
> bash> svn add file4
> A file4
> bash> svn commit
> Adding /home/moloney/sandbox/example/file4
> Committed revision 2.
> bash> svn remove file[24]
> D file2
> D file4
> bash> svn commit
> The commit message has been stored in this location:
> /home/moloney/sandbox/example/.svn/tmp/tempfile.62968.00001.tmp
>
> apr_error: #20014, src_err 0 : <Error string not specified yet>
> commit failed: wc locks and tmpfiles have been removed.
>
> apr_error: #20014, src_err 0 : <Error string not specified yet>
> commit failed: while sending tree-delta to repos.
>
> apr_error: #20014, src_err 0 : <Error string not specified yet>
> CHECKOUT of /svn/example/$svn/ver/0.0/ returned status code 409
> (Conflict)

Tim, I can't reproduce this problem. Can you rebuild today's latest
httpd, apr, apr-util, and svn (r1459+), and tell us if it still
happens for you?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 8 06:59:07 2002

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