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

2011-05-15 Thread Paolo Compieta
(perhaps we should move to the dev-list? i'm not expert of this, i'll follow the thread) I've removed code references cause i'm asking a few more "conceptual" questions here, to understand if we can simplify the detection avoiding the diff. Fire me if i become trivial. On Wed, May 4, 2011 at 12:0

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

2011-05-03 Thread Paolo Compieta
ts or analyzing code for the solution? Do you have already a clear list of shortcomings to be fixed before starting to implement this kind of detection? On Sun, May 1, 2011 at 3:22 PM, Stefan Sperling wrote: > On Sun, May 01, 2011 at 01:13:14PM +0200, Paolo Compieta wrote: > > On Sat, Apr 30, 2

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

2011-05-01 Thread Paolo Compieta
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 wrote: > Please find attached the repro-template(s) to reproduce the case in Ubuntu > and Win7. > > Cheers, > Paolo Compieta >

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

2011-05-01 Thread Paolo Compieta
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 wrote: > Hi, > this is a first post, hope it's well written and clear. I've found this > (candidate-)bug while at w

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

2011-05-01 Thread Paolo Compieta
On Sat, Apr 30, 2011 at 8:56 PM, Stefan Sperling wrote: > This is a remaining task tracked in this issue: > http://subversion.tigris.org/issues/show_bug.cgi?id=3150#desc4 > > I would expect this feature to appear in the 1.8 or a later release. > +1 to put this in 1.7, or one more 1.6.x In my c

Merge, undetected tree conflict when source tree moves directory

2011-04-30 Thread Paolo Compieta
;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