[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Conflicts between added files.

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2002-11-25 15:47:28 CET

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.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 25 15:48:15 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.