You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel F Garcia <dg...@kobold.com.au> on 2004/04/28 03:44:49 UTC
HELP - Subversion ate my working file
Environment
* Windows XP
* Tortoise SVN 1.0.3 Build 971
* Subversion 1.0.1 running under Debian linux
Problem Description
* I have a developer (Developer 1) who made extensive changes to a source
file
* The last known time he had the file was last Tuesday 20th April
* Since then there have been two commits from another developer (Developer
2) (Thursday 22nd April and Tuesday 27th April)
* On Thursday 22nd of April Developer 1 did an update. The Commit from
Developer 2 was still running, but the file in question had already been
committed. According to the web logs the update did not touch the file in
question.
* This morning the Developer 1 did an update then a commit
* The update did not raise a conflict, but we are unsure whether it did a
merge.
* After that the first developer went to work on his file and his changes
are gone
* The web logs from this morning are: (the file in question is
BranchCreate.aspx.cs)
10.6.0.10 - - [28/Apr/2004:11:15:12 +1000] "REPORT /!svn/vcc/default
HTTP/1.1" 200 1896 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:41 +1000] "PROPFIND
/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs HTTP/1.1" 207 764
"
-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:42 +1000] "PROPFIND /!svn/vcc/default
HTTP/1.1" 207 382 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:43 +1000] "PROPFIND /!svn/bln/390 HTTP/1.1"
207 437 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:43 +1000] "PROPFIND
/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs HTTP/1.1" 207 764
"
-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:44 +1000] "PROPFIND /!svn/vcc/default
HTTP/1.1" 207 437 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:44 +1000] "PROPFIND
/!svn/bc/390/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs
HTTP/1.
1" 207 776 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:45 +1000] "PROPFIND
/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs HTTP/1.1" 207 764
"
-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:46 +1000] "PROPFIND /!svn/vcc/default
HTTP/1.1" 207 437 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:16:46 +1000] "PROPFIND
/!svn/bc/390/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs
HTTP/1.
1" 207 254221 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:17:16 +1000] "PROPFIND
/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs/BranchCreate.aspx.
c
s HTTP/1.1" 207 772 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:17:17 +1000] "PROPFIND /!svn/vcc/default
HTTP/1.1" 207 382 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:17:17 +1000] "PROPFIND /!svn/bln/390 HTTP/1.1"
207 437 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:17:18 +1000] "PROPFIND
/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs/BranchCreate.aspx.
c
s HTTP/1.1" 207 772 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:17:19 +1000] "PROPFIND /!svn/vcc/default
HTTP/1.1" 207 437 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
10.6.0.10 - - [28/Apr/2004:11:17:19 +1000] "REPORT
/!svn/bc/390/Systems/Projects/IDMS%20B0/6%20-%20Source/trunk/www/Tabs/Branch
Cre
ate.aspx.cs HTTP/1.1" 200 19402 "-" "SVN/1.0.1 (dev build) neon/0.24.4"
Daniel F Garcia
Project manager
Mobile: 0438 670 947
Phone: 07 5461 1120
Email: dgarcia@kobold.com.au
Address: 4 Lloyd George Street, Eastern Heights QLD 4305
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: HELP - Subversion ate my working file
Posted by Ben Collins-Sussman <su...@collab.net>.
On Tue, 2004-04-27 at 22:44, Daniel F Garcia wrote:
>
> * I have a developer (Developer 1) who made extensive changes to a source
> file
> * The last known time he had the file was last Tuesday 20th April
> * Since then there have been two commits from another developer (Developer
> 2) (Thursday 22nd April and Tuesday 27th April)
> * On Thursday 22nd of April Developer 1 did an update. The Commit from
> Developer 2 was still running, but the file in question had already been
> committed. According to the web logs the update did not touch the file in
> question.
This is to be expected. When a checkout starts, it latches onto a
single revision tree, which is immutable by definiton. Similarly, a
commmit-in-progress is invisible to readers, until the commit finishes
completely and becomes a new revision.
> * This morning the Developer 1 did an update then a commit
> * The update did not raise a conflict, but we are unsure whether it did a
> merge.
If the file was locally modified, and the server's version was newer,
then yes, 'svn update' always does a merge. There's no question about
it.
> * After that the first developer went to work on his file and his changes
> are gone
There must be more to this story. The server logs don't say anything,
other than "somebody ran an update". And if the developer was using
TortoiseSVN, then there's even less the main svn developers can do;
maybe the Tortoise folks have some insight.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org