[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] issue #3354 for non-interactive case

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 22 Jan 2009 17:42:52 +0000

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
Received on 2009-01-22 18:43:17 CET

This is an archived mail posted to the Subversion Dev mailing list.