RE: Re: Problem with multiple users moving and updating files

Nico Kadel-Garcia wrote:
> Gale, David wrote:
>
>> OK, Nico: what did I do wrong? It sure looks to me as if branches
>> are not the solution--in fact, they make it more likely that changes
>> could quietly disappear, which is the exact opposite of what we want!
>>
>> -David
>
> Good breakdown of the problem. Ouch.
>
> But why are you doing merges without doing "svn diff" first?

Well, I was doing it just as a quick illustration of the problem. But
it's also likely that users will trust svn to merge changes smoothly,
and report any conflicts that occur, since that's what svn generally
does. And, of course, for a one-file merge, looking at a diff is easy;
for a multiple-hundred file branch merge, diffs just aren't feasible.

It's nice that subversion lets us copy a file and keep its revision
history; I just wish that it actually supported renaming files.

-D.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 28 04:47:18 2006