Re: [PATCH] issue #3469: tree conflict under a directory external

2011-03-28 Thread Daniel Shahaf
'Daniel Shahaf' wrote on Mon, Mar 28, 2011 at 00:16:49 +0200: > Bert Huijben wrote on Sun, Mar 27, 2011 at 19:26:50 +0200: > > and there are easier (and more > > performant) ways to check if a node is part of a working copy (e.g. helpers > > to check if a path is switched/a wc root). > > Could yo

Re: [PATCH] issue #3469: tree conflict under a directory external

2011-03-27 Thread 'Daniel Shahaf'
Bert Huijben wrote on Sun, Mar 27, 2011 at 19:26:50 +0200: > > -Original Message- > > From: Daniel Shahaf [mailto:danie...@elego.de] > > Sent: zondag 27 maart 2011 0:31 > > To: dev@subversion.apache.org > > Subject: [PATCH] issue #3469: tree confl

RE: [PATCH] issue #3469: tree conflict under a directory external

2011-03-27 Thread Bert Huijben
> -Original Message- > From: Daniel Shahaf [mailto:danie...@elego.de] > Sent: zondag 27 maart 2011 0:31 > To: dev@subversion.apache.org > Subject: [PATCH] issue #3469: tree conflict under a directory external > > Issue #3469 is about having merge pull in the ad

[PATCH] issue #3469: tree conflict under a directory external

2011-03-26 Thread Daniel Shahaf
Issue #3469 is about having merge pull in the addition of A/mu when A/ is an external. (File modifications work and raise a tree conflict.) The following patch attempts to address it by having merge_file_added() skip the addition of files under a directory external. Thoughts or +1's? Daniel [[