Hi,
just before Christmas I asked for confirmation of this behaviour, but
received no answer, due to the Holidays and my circumstantial
explanation. (And without any reply I cannot build on that post, but
have to start a new thread as Google censors all own postings.)
Meanwhile I worked it out on a test repository and it turned out
even worse than supposed:
create repository;
checkout working copy;
populate wc with files file1.txt, file2.txt, file3.txt, each with some
content;
add & commit above files (rev.1);
add folder newfolder to wc & commit (rev.2);
svn move file1.txt, file2.txt, file3.txt to newfolder;
svn commit (rev.3);
modify content of newfolder/file1.txt, newfolder/file2.txt,
newfolder/file3.txt;
commit (rev.4);
svn merge -r 3:2;
=>
file1.txt, file2.txt, file3.txt are resurrected fine in their state before
the move, newfolder/file1.txt, newfolder/file2.txt, newfolder/file3.txt
are removed.
BUT all changes done on the files while in newfolder are gone, too
=> DATALOSS!
I suppose I could now merge rev. 4 onto the resurrected files
somehow. But what a tedious task if there are a hundred files
involved, affected by many revisions between rename/move and
undoing rename/move.
Am I missing something here or should there be a warning that
undoing a rename/move undoes ALL other modifications on the
respective files since?
TIA
Jan Hendrik
---------------------------------------
Freedom quote:
In the end, we will remember not the words of our enemies,
but the silence of our friends.
-- Martin Luther King Jr.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=994915
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-29 11:05:32 CET