On Oct 13, 2004, at 4:12 PM, Mark Phippard wrote:
> Ben Collins-Sussman <sussman@red-bean.com> wrote on 10/13/2004 02:58:53
> PM:
>
>> Let me reiterate some agreements we seem to have reached, so far:
>>
>> - If update would produce conflict on a 'hijacked' file:
>> print warning, then choose WC fulltext, backup repos
>> fulltext.
>
> So that I am clear, if the update could merge the changes it would, and
> only if it couldn't it would create these files? I guess that is OK,
> bit
> I am still not 100% clear why it would not just create the same files
> that
> a merge conflict would create or why the situation is different.
>
The goal here is that the "non VC" user never ever sees a Conflict. We
don't want non-techies to see a "C" next to a file, to have to
understand the 3 fulltexts, or the 'svn resolved' command. Go look at
the 'hijack' section of the UI document to understand this motivation.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 13 23:03:15 2004