Concerning Re: Rename: data loss
Ben Collins-Sussman wrote on 7 Sep 2003, 14:37, at least in part:
> "Sindbad the Seafarer" <sindbad.the.seafarer@gmx.net> writes:
>
> > The curious thing, however, is that a search showed wc1/file1 was
> > still present,
>
> Yes, this is one of those "tree conflict" situations, specifically
> issue 1196 (which Sander is working on right now!)
>
> The situation is: you have a file that is locally modified, and 'svn
> up' tries do delete it. This is exactly what happened to you.
>
> At the moment, what happens is that your working file simply becomes
> unversioned. It's still present, however. So please don't say any
> data was lost... it wasn't. :-)
Quite right, I found it (and I knew very well what data it was). But
what you outline about obstructed update makes much sense.
Otherwise the thought to be deleted file would have lived on without
notice. Maybe one would have stumbled about it on the next
commit with TSVN, but as likely it could have been selected for
adding without second thought - there are days we add dozens of
new files. I am trying to do this via a toolbar in the HTML editor, but
images fall through this anyway. And with TSVN it is very
convenient.
I must admit that I was deliberately driving it to this point as in our
website production here it is something that, though not happening
every day, is relatively likely to happen: I put an illustration into the
page while the other does something significant like a price change
that requires a new name for the file.
Now I only wonder what would have happened if wc1/file1 with the
added paragraph had been already committed before
wc2/renamedfile1? Would then the added paragraph in file1 had
been merged into renamedfile1? (I simply have nothing around
today to just try it.)
Jan Hendrik
---------------------------------------
Freedom quote:
The right to be let alone is indeed the beginning of all freedom.
-- Supreme Court Justice William O. Douglas
---------------------------------------
Mailed with Pegasus Mail 3.12c (32bit).
Never heard of it?
Easy to use, full featured - and freely available.
And *no* automatic virus activation and spreading.
Take a look at http://www.pmail.com
Give it a try - and you'll never miss anything else.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 8 13:12:34 2003