kfogel@collab.net wrote:
>"Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil> writes:
>
>
>>One of my users asked me the same thing. She said, "What if, when I update,
>>a file I've been working on is merged with some lines from someone else, and
>>even though there are no conflicts, this breaks the code?"
>>
>>I answered, "After you update, build and run it to make sure it's working."
>>
>>She replied, "Yeah, but my working copy is now lost, as it was replaced with
>>the merged version. So now I have to manually go through the file and try to
>>sort out my code from the other code. I think I'll make a backup of my
>>working copy before I update each time."
>>
>>
>
>I'm not sure this is a big enough problem to warrant any special
>support. Honestly, in ~8 years of working with copy-modify-merge
>revision control systems (CVS and then Subversion), I think I've maybe
>lost a total of 30 minutes to this sort of semantic problem. Usually
>I knew in advance (from commit mails or other forms of developer
>communication) that the incoming change was dangerous, and adjusted my
>update accordingly.
>
>
>
I'm not sure because I have never tried to do this with Subversion, but
is it possible to switch to an older version of the file and have
Subversion automatically unmerge changes from the repository or do you
have to rely on diff and patch for this?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 18 17:36:45 2003