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

Re: [BUG] Manual conflict removal leads to spurious revert report

From: Ed Price <ed.price_at_gmail.com>
Date: 2006-03-07 02:50:08 CET

Oops, I forgot to fill in the issue number (2517) in the patch:

+# Test for issue ### ???

If the patch is otherwise good please tweak that?
Otherwise I'll include it in the next rev!
Thanks,
-Ed

On 3/6/06, Ed Price <ed.price@gmail.com> wrote:
> > +1 on filing this as an issue (although I think I agree with you
> > that your quick-n-dirty patch is not The Right Fix :-) ). Can you
> > make sure the issue links back to this email thread, so readers of
> > the issue can find the discussion?
>
> Done.
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2517
>
> I wasn't sure whether to copy the original message into the issue. I
> just wrote a short summary instead.
>
> > I think the fix is just a Simple Matter Of Programming, but I don't
> > know where to actually make the changes. One useful contribution
> > would be an "XFAIL" regression for it, since that can be done right
> > now and reduces the burden on whoever eventually fixes the bug...
>
> I haven't attempted that SMOP yet; it does seem rather awkward...
>
> Meanwhile I've attached a testcase. Please review/commit/whatever :)
>
> Thanks,
> -Ed
>
> [[[
> Test case for issue #2517.
>
> * subversion/tests/cmdline/svntest/main.py
> (file_write): New function.
>
> * subversion/tests/cmdline/revert_tests.py
> (revert_after_manual_conflict_resolution): New test.
> (test_list): Add new test (as XFail).
> ]]]
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Mar 7 02:52:58 2006

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