Dale Worley wrote:
> Have you actually *tried* any of these? These are areas of Subversion that
> have not gotten a lot of attention yet, and you'll get better information if
> you try out your specific cases to see how they work than if you ask people
> who haven't thought much about them.
Here's a recipe, and sample run at end.
rd /s/q repos wc-bob wc-tim
svnadmin create repos --fs-type=fsfs
svn checkout file:///repos wc-bob
svn add lib
svn commit -m "Bob's first edit"
svn checkout file:///repos wc-tim
svn mkdir libcomplex
svn move lib\file.txt libcomplex
svn commit --message "Moving files around, just for fun"
echo "having made some edits, I'm willing to bet" >lib\file.txt
svn commit -m "Committing Bob's conflicting change"
$ svn --version
svn, version 1.1.0 (r11180)
compiled Oct 4 2004, 21:11:18
$ svnadmin create repos --fs-type=fsfs
$ svn checkout file:///repos wc-bob
Checked out revision 0.
$ cd wc-bob
$ md lib
$ echo 1>lib\file.txt
$ svn add lib
$ svn commit -m "Bob's first edit"
Transmitting file data .
Committed revision 1.
$ cd ..
$ svn checkout file:///repos wc-tim
Checked out revision 1.
$ cd wc-tim
$ svn mkdir libcomplex
$ svn move lib\file.txt libcomplex
$ svn commit --message "Moving files around, just for fun"
Committed revision 2.
$ cd ..\wc-bob
$ echo "having made some edits, I'm willing to bet" 1>lib\file.txt
$ svn commit -m "Committing Bob's conflicting change"
svn: Commit failed (details follow):
svn: File not found: transaction '2-1', path '/lib/file.txt'
$ svn update
Updated to revision 2.
$ svn status
So, Subversion 1.1.1 unversions the file, but leaves it as-is (no
dataloss guarantee). Use is responsible for making the right thing.
In this case, I would think there is a chance for dataloss - the user is
not informed that the file was unversionned. So, if I don't do status,
I won't know that there's something that occured in my WC.
I'll take it up on the dev@ list.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Thu Nov 11 15:37:49 2004