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

Re: Merge, undetected tree conflict when source tree moves directory

From: Paolo Compieta <paolocompieta_at_gmail.com>
Date: Sat, 30 Apr 2011 18:38:23 +0200

Attaching also the complete script for Win7.
(i already sent the template to the dev list)

Paolo

On Sat, Apr 30, 2011 at 6:36 PM, Paolo Compieta <paolocompieta_at_gmail.com> wrote:
> Please find attached the repro-template(s) to reproduce the case in Ubuntu and Win7.
>
> Cheers,
> Paolo Compieta
>
>
> On Sat, Apr 30, 2011 at 6:29 PM, Paolo Compieta <paolocompieta_at_gmail.com> wrote:
>> Hi,
>> this is a first post, hope it's well written and clear. I've found this
>> (candidate-)bug while at work, and it's a big problem for my company.
>> I'm posting this to ask if it's a known bug (i haven't found anything
>> similar in the issue tracker, hope i did the right searches) or if it's
>> some stupid practice we're using that impairs us from handling "svn
>> move on dirs" properly.
>>
>> --- Details:
>>
>> OS: Ubuntu 10.04, Windows Vista
>> Subversion: 1.6.16
>>
>> Bug: while merging, svn doesn't detect a tree conflict when:
>>  source branch has "svn moved" (i.e. deleted) a folder
>>  destination branch has modified a file inside the same folder
>>
>> Step to reproduce:
>> - trunk has folder A and file A/iota, branch is copied from this
>> - trunk moves (deletes) folder A, branch modifies A/iota
>> - branch merges from trunk
>>
>> Actual behavior:
>>  svn doesn't rise any conflict or warning, discarding all
>>  modifications in the branch
>> Expected behavior:
>>  TREE CONFLICT: the directory being deleted in the branch
>>  has changed from the merge's initial revision (see "Use
>>  Case 5" and "Equality of directories" in
>>  http://svn.apache.org/repos/asf/subversion/trunk/notes/tree-conflicts/detection.txt)
>>
>>
>> Cheers,
>> Paolo Compieta
>>
>
>

Received on 2011-05-02 01:15:29 CEST

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

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