Re: Problem with changes lost

"Luis Castro" <quarkalone@gmail.com> writes:
> I'm using SVN for about a half a year with great success and my team
> (5 people) has commited around 4500 changes. We are using SVN 1.4.0
> with mod_dav_svn in a Win 2k and TortoiseSVN.
>
> At first the idea of non-blocking files was disturbing, but the
> dynamics of the group has been well and we faced to small quantity of
> conflicts.
>
> However, today an user informed me that he lost the changes done to a
> file three days ago.
>
> Looking at the log in TortoiseSVN I have found another user who
> commited changes to the same file. We asked the second user about the
> lost changes and she say she made an update form the repository, made
> some changes and then made a commit.
>
> Apparently, when she made the update the merge did not happen. And
> when she commited, she rewrote the first user changes.
>
> Is it possible? Our biggest concern is that this problem may happen again.

You didn't lose the changes, they're still in the repository, in the
history of the file. What you had here was a bad merge; no VC system
can prevent that... See:

http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve

-Karl

-- 
Subversion support & consulting  <>  http://producingoss.com/consulting.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org