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

Re: Update problem: Tree conflicts vs content conflicts

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-09-07 21:48:08 CEST

Erik Huelsmann <ehuels@gmail.com> writes:

> # break history here
> $ svn rm a
> $ echo you >a
> $ svn add a
> $ svn up
> $ svn st
> # shows R a
> $ cat a
> # shows
>>you
>>mine
>
> As you can see, svn merged the changes into 'a' without so much as a
> warning. I think this sholud be a conflict though: the file being
> changed is not related anymore to the file which was originally
> modified on the other branch. The update operation should have
> resulted in a 'C'onflict.

There is a similar problem if 'a' is not replaced but simply schedule
'D': update causes the working file to get restored, although the
schedule 'D' remains.

There is yet another problem is 'a' is schedule 'R' and the update
deletes rather than modifies: update causes the schedule 'R' file to
become unversioned.

Is a 'C'onflict correct? An alternative would be that the text-base
of the deleted file gets updated but that the scheduling and the
working file should not be touched. If the update deletes the file,
then the schedule replace could become a schedule add, if the update
replaces the file then a 'C'onflict is probably necessary.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 7 21:49:13 2005

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