Take a look at the following thread on the GCC mailing list:
http://gcc.gnu.org/ml/gcc/2005-11/msg00904.html
Steve Kargl writes:
>The scenario is:
>
>Committer1: I have a patch with a new file that needs review.
>Committer2: Grabs patch and put everything in local tree to review.
>Committer2: Does not use "svn add" or any other svn command.
>Committer2: Finishes review and tells committer1 to check patch in.
>Committer1: Commits patch
>Committer2: Now wants to update his local repository. Files conflict.
It seems to me that, when a WC already has a file of the same name as
a file that 'update' would like to add to the WC, and the contents of
the existing WC file and the incoming file are the same, that
Subversion should simply note the situation and move on. Steve says
it dies with an error message.
Now, I'm 100% for Subversion not just wiping out users' files. As I
said in the GCC thread, "Subversion is reluctant to blow away users'
files; this was one of the qualities of CVS we thought we should try
to retain."
But this is a different case. No information would be lost. Or, more
accurately, the information that the file used to be an unknown ('?')
file in the WC would be lost, but I don't think anyone really cares
about that.
What do folks think?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 21 02:36:53 2005