Thanks for all the responses. I tried all of the suggestions, but
unfortunately none of them worked. I also downloaded and installed
subversion 1.6.5, along with apache 2.2.14 to see if maybe I needed
more recent versions. I still have the same strange behavior, where
either the sub-directory a
I'm equally baffled how to achieve this sub-directory permissioning.
I also recently posted questions about this (see this link)
http://svn.haxx.se/users/archive-2009-12/0310.shtml
I tried all of the suggestions, non of which worked. Maybe some will
work for you. I also downloaded and installed
On Sun, Dec 20, 2009 at 06:02:22PM +, William S Fulton wrote:
> Hi,
>
> We have been doing regular two way merges from trunk to branch and
> vice-versa using svn 1.5. In 1.6 this results in tree conflicts. Is
> there any guidance on how to deal with this scenario?
I think you should try to av
Hi,
We have been doing regular two way merges from trunk to branch and
vice-versa using svn 1.5. In 1.6 this results in tree conflicts. Is
there any guidance on how to deal with this scenario? All I can find is
the svn book, which only talks about tree conflicts wrt to working
copies. I have