I often get conflicts during the commit after I add or delete files.
After a commit, I would expect the repository and the working copy
to be in sync. Yet I often have to do an update so that the working
copy sees the added or deleted files that it had previously committed.
Example:
bash> svn checkout http://localhost/svn/example
bash> cp ~/.bashrc file1
bash> cp ~/.bashrc file2
bash> cp ~/.bashrc file3
bash> mkdir dir1
bash> mkdir dir2
bash> mkdir dir3
bash> cp ~/.bashrc dir3/file3
bash> cp ~/.bashrc dir2/file2
bash> cp ~/.bashrc dir1/file1
bash> svn add *
A dir1
A dir2
A dir3
A file1
A file2
A file3
bash> svn add dir?/*
A dir1/file1
A dir2/file2
A dir3/file3
bash> svn status
A ./dir1
A ./dir1/file1
A ./dir2
A ./dir2/file2
A ./dir3
A ./dir3/file3
A ./file1
A ./file2
A ./file3
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)
bash> svn update
A ./file2
A ./file4
bash> svn commit
Deleting /home/moloney/sandbox/example/file2
Deleting /home/moloney/sandbox/example/file4
Committed revision 3.
bash> cp ~/.bashrc file5
bash> svn add file5
A file5
bash> svn commit
Adding /home/moloney/sandbox/example/file5
Committed revision 4.
bash> svn remove dir1
D dir1/file1
D dir1
bash> svn commit
The commit message has been stored in this location:
/home/moloney/sandbox/example/.svn/tmp/tempfile.62968.00002.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.2/ returned status code 409
(Conflict)
bash> svn update
D ./file2
D ./file4
bash> svn commit
Deleting /home/moloney/sandbox/example/dir1
Committed revision 5.
bash>
Is this correct?
--
Tim Moloney
ManTech Real-time Systems Laboratory
2015 Cattlemen Road \ /
Sarasota, FL 34232 .________\(O)/________.
(941) 377-6775 x208 ' ' O(.)O ' '
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 8 01:32:21 2002