My co-worker modified a file, committed, and then I modified it and tried to
commit (without first updating). My commit failed because I needed to merge
his changes, so I tried to update. That failed as well. Then I went about
destroying all the evidence that would have helped you (logs). Forgive a
newb.
I’m running:
svn, version 1.2.0 (r14790)
compiled Jun 10 2005, 22:10:10
Repos is running same version of svn, I believe, FSFS.
Here’s the only other data I can give you (I think), which is copied and
pasted from my shell:
me ~/OMNIRepos/3270Services/Engine3270
$ ci
Sending Engine3270/Engine3270.csproj
Deleting Engine3270/Fee.cs
Adding Engine3270/HudCharge.cs
Sending Engine3270/LISLoan.cs
Sending Engine3270/LPSLoan.cs
Sending Engine3270/LoanBase.cs
Transmitting file data .....svn: Commit failed (details follow):
svn: Out of date: '/3270Services/Engine3270/Engine3270.csproj' in
transaction '1039-1'
svn: Your commit message was left in a temporary file:
svn: '/cygdrive/c/OMNIRepos/3270Services/svn-commit.2.tmp'
me ~/OMNIRepos/3270Services/Engine3270
$ up
G LISLoan.cs
G LoanBase.cs
G LPSLoan.cs
G Engine3270.csproj
svn: In directory '.'
svn: Error processing command 'merge' in '.'
svn: Can't move 'Engine3270.csproj.3.tmp' to 'Engine3270.csproj': Permission
denied
me ~/OMNIRepos/3270Services/Engine3270
$ svn cleanup
svn: In directory '.'
svn: Error processing command 'merge' in '.'
svn: Can't copy '.svn/tmp/text-base/LISLoan.cs.svn-base' to
'LISLoan.cs.3.tmp.2.tmp.tmp': No such file or directory
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 14 22:54:56 2005