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

2011-05-16 Thread Stefan Sperling
On Sun, May 15, 2011 at 07:01:55PM +0200, Paolo Compieta wrote: > (perhaps we should move to the dev-list? i'm not expert of this, i'll follow > the thread) Feel free to start a new thread on the dev list if you have a design proposal or a patch. > Said that rename=deletion++, i'd concentrate onl

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-04 Thread Stefan Sperling
On Wed, May 04, 2011 at 01:32:02AM +0200, Paolo Compieta wrote: > Thanks for the reply, your decision not to block the release makes sense. > Also, i was thinking of a temporary workaround for marking directories in > destination branches to inhibit their deletion.. but it seems there isn't > any.

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

2011-05-03 Thread Paolo Compieta
Thanks for the reply, your decision not to block the release makes sense. Also, i was thinking of a temporary workaround for marking directories in destination branches to inhibit their deletion.. but it seems there isn't any. May i help somehow to make this land in 1.7.x? Writing tests or analyzi

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 > > > On Sat, Apr 30, 201

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 work, and it's a big prob

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

2011-05-01 Thread Stefan Sperling
On Sun, May 01, 2011 at 01:13:14PM +0200, Paolo Compieta wrote: > 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

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

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

2011-04-30 Thread Stefan Sperling
On Sat, Apr 30, 2011 at 06:29:19PM +0200, Paolo Compieta 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 i

Merge, undetected tree conflict when source tree moves directory

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