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

Re: [Issue 3210] New - Merge should raise a tree-conflict when deleting a modified item (UC5)

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 29 May 2008 14:22:46 +0100

Stefan Sperling wrote:
> On Thu, May 29, 2008 at 12:42:32PM -0000, julianfoad_at_tigris.org wrote:
>> Issue #|3210
>> Summary|Merge should raise a tree-conflict when deleting a mod
>> |ified item (UC5)
>> Component|subversion
>> Version|trunk
>> Platform|All
>> URL|http://svn.collab.net/repos/svn/branches/tree-conflict
>> |s
>> OS/Version|All
>> Status|NEW
>> Status whiteboard|
>> Keywords|
>> Resolution|
>> Issue type|DEFECT
>> Priority|P3
>> Subcomponent|unknown
>> Assigned to|issues_at_subversion
>> Reported by|julianfoad
>>------- Additional comments from julianfoad_at_tigris.org Thu May 29 05:42:31 -0700 2008 -------
>>When "svn merge" attempts to delete a file or dir, if the target item to be
>>deleted differs from the merge-left item that was deleted from the source, then
>>it should raise a tree conflict. If they are identical, it should just schedule
>>the item for delete and not raise a conflict.
>>The comparison applies to a file's content and properties, or to a directory's
>>children (recursively) and properties.
>>This is use case 5 of notes/tree-conflicts/use-cases.txt.
> Julian,
> We do this for file contents already, right? (At least I remember
> implementing it... :)
> I assume this issue is about properties and directories only, and

Yes, that's right: file-content is already checked, but file-properties and
directory-contents and directory-properties are not. I didn't mean to imply
that all four combinations were broken.

> mentions files only for consistency? Or do we have a bug when handling
> file content?

It mentions files because we need to check both their content and their
properties. There's no known bug in the content check.

Thanks for pointing this out. I'll annotate the issue.

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-29 15:23:03 CEST

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.