Re: svn up doesn't work after svn tree merging

2005-04-05 Thread Stas Bekman
Brian W. Fitzpatrick wrote: On Tue, 2005-04-05 at 14:27 -0400, Stas Bekman wrote: Brian W. Fitzpatrick wrote: On Tue, 2005-04-05 at 13:56 -0400, Stas Bekman wrote: Brian, here is the whole problematic checkout: http://people.apache.org/~stas/mp2-svn.tgz May you will be able to figure out what are

Re: svn up doesn't work after svn tree merging

2005-04-05 Thread Stas Bekman
Brian W. Fitzpatrick wrote: On Tue, 2005-04-05 at 13:56 -0400, Stas Bekman wrote: Brian, here is the whole problematic checkout: http://people.apache.org/~stas/mp2-svn.tgz May you will be able to figure out what are the problems by just using it. For starters, a lot of your directories in the work

Re: svn up doesn't work after svn tree merging

2005-04-05 Thread Stas Bekman
Brian, here is the whole problematic checkout: http://people.apache.org/~stas/mp2-svn.tgz May you will be able to figure out what are the problems by just using it. Thanks. -- __ Stas BekmanJAm_pH --> Just Another mod_p

Re: svn up doesn't work after svn tree merging

2005-04-05 Thread Stas Bekman
Brian W. Fitzpatrick wrote: On Tue, 2005-04-05 at 13:09 -0400, Stas Bekman wrote: Brian W. Fitzpatrick wrote: Have you tried checking out a new working copy? Is this after successfully committing the merge, or before? Checking out a new copy is fine. In fact a checkout in another tree which had n

Re: svn up doesn't work after svn tree merging

2005-04-05 Thread Stas Bekman
Brian W. Fitzpatrick wrote: Have you tried checking out a new working copy? Is this after successfully committing the merge, or before? Checking out a new copy is fine. In fact a checkout in another tree which had no changes worked fine as well. The events were as follows; 1) check out trunk 2)