On Mon, 2 Apr 2007, igor vieira wrote:
> "I was working in a file "A", before i commit changes i updated the local
> folder, and then i lost what i changed on file "A".
>
> this is the question:
>
> Update action overwrite my changes, if im working on File A and i update
> then the repository´s File A will replace my local archive?? Does it replace
> my changes if I change a file??
>
> As i said to guy: "i think it isnt possible, svn didnt overwritte files."
> Am i right?? or no??
svn wouldn't overwrite the file, but it would merge the file, if
someone else had modified the file since the last time the guy had updated
his copy. In the manual, there is a statement that says something like
"we won't ever lose information", and I haven't ever seen svn lose
information, but it does seem like it would be possible, in the case where
svn thought it could merge the data successfully, so it goes ahead and
merges without causing a conflict. The author would have been information
that his file was merged instead of updated/no change at minimum.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Apr 2 17:20:06 2007