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

Re: Adding a new file to a patch work flow problem

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-12-19 17:04:26 CET

On Thu, 2003-12-18 at 16:47, Barry Scott wrote:

> My expectation was that svn up would see that the file is added in the
> wc and update wants to add so they match semantically. Then it would
> just do the merge/conflict stuff as happens to versioned files.

No, I don't think svn will ever do such a thing. Contextual merging
happens between two versions of the *same* file, both under version
control. But in your scenario, svn views the situation as two users
trying to add a certain filename to the repository at the same time.
It's not prudent to assume that the two files are related, just because
they have the same name; instead, this is viewed as a conflict of
*intent*, rather than a conflict of content. In other wods, it's a
"tree" conflict, not a content conflict. ("Hey, you can't add a brand
new file 'foo.c', because there's already one there.")

There are similar scenarios to this as well -- one user deletes a file,
while another one changes it. Whoever commits first, well -- the second
guy is going to get tree conflict when they either commit or update.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 19 17:05:08 2003

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.