Garrett Rooney wrote:
> Ben Collins-Sussman wrote:
>
>> You claim that this is a common situation. Is that true? In a year
>> and a half of using Subversion every day, I've never seen this
>> scenario happen before. Why does it happen to you so often?
>>
>
> this is common for people who don't have commit access to the repository
> in question.
>
> they are creating a patch which involves adding files, then they submit
> the patch to the maintainer, he applies it, they update and get a conflict.
>
> that said, i think ben is correct, and the current behaviour is correct
> from a safety standpoint. i'd rather a little annoyance than a lot of
> potential data loss.
There is NO potential for data loss. This case will be treated as merge with
conflict, so you'd have your original file and repository file readily
available.
- Volodya
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 25 16:06:22 2002