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

Re: [PATCH] (v2) fix issue 2517 (Manual conflict removal leads to spurious revert report)

From: Branko ─îibej <brane_at_xbc.nu>
Date: 2006-03-11 08:47:42 CET

Ed Price wrote:
> [[[
> Fix for issue #2517 (manual conflict removal leads to spurious
> revert report).
>
> * subversion/libsvn_wc/adm_ops.c
> (revert_admin_things): Set '*reverted' only on real revert.
>
> * subversion/tests/cmdline/svntest/main.py
> (file_write): New function.
>
> * subversion/tests/cmdline/revert_tests.py
> (revert_after_manual_conflict_resolution__text): New test.
> (revert_after_manual_conflict_resolution__prop): New test.
> (test_list): Add new tests.
> ]]]
>
Committed in r18842. Thanks!

-- Brane

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 11 08:47:58 2006

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