I'm so glad to see that the fix is simple. It's just a pity that simple
errors so often require extensive debugging. Thanks, guys.
- Julian
Stefan Sperling wrote:
> On Thu, Jan 22, 2009 at 12:31:53PM -0500, Paul Burba wrote:
> > Hi Stefan,
> >
> > My patch and log message is attached, here is the log:
> >
> > [[[
> > Fix issue #3354 when there is no interactive conflict resolution.
> >
> > * subversion/libsvn_wc/merge.c
> > (maybe_resolve_conflicts): Consider no interactive conflict resolution
> > as analogous to postponing conflict resolution.
> >
> > * subversion/tests/cmdline/update_tests.py
> > (test_list): Remove XFail from update_moves_and_modifies_an_edited_file.
> > ]]]
> >
> > I ran the test suite [FSFS] x [RA_LOCAL] using both of our patches and
> > all the tests pass, including update_tests.py 52 with the changes I
> > just made in r35388 (see below).
>
> Nice :)
>
> > We are doing essentially the same thing, but I think mine is slightly
> > clearer (but that's probably because I wrote it :-) Of course,
> > speaking of clear within the context of an undocumented function is a
> > bit comical. I'll defer to you all who have spent a lot more time in
> > this code as to which approach is better.
>
> +1 on your patch.
>
> And thanks heaps for helping!
> Stefan
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1044722
Received on 2009-01-23 12:49:55 CET