Why am I getting a bad merge?

2010-06-19 Thread Steven Boswell II
(I asked this question almost a month ago on the users list, but got no response, so now I'm trying the developers list.) I recently began using Subversion to track a project at the new company where I work.  We've been using it for a few weeks, and our database has just over 60 commits to it n

Re: svn commit: r955846 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

2010-06-19 Thread Greg Stein
On Sat, Jun 19, 2010 at 01:47, Senthil Kumaran S wrote: > Greg Stein wrote: >> On Fri, Jun 18, 2010 at 02:39,   wrote: >>> ... >>> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Fri Jun 18 >>> 06:39:31 2010 >>> @@ -5208,10 +5208,12 @@ make_editor(svn_revnum_t *target_revisio >>>   if (

Re: BUG: WC-NG code crawls too high to find WC root

2010-06-19 Thread C. Michael Pilato
C. Michael Pilato wrote: > C. Michael Pilato wrote: >> From time to time, I've seen evidence that our trunk code is walking up too >> far in its parent tree as well, but every time I try to create a reliable >> recipe, I can't. I have nothing but wc-1 working copies on my system for >> day-to-day