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

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

From: Ed Price <ed.price_at_gmail.com>
Date: 2006-03-11 04:31:07 CET

> > The previous code would overwrite the initial value, which isn't
> > necessarily correct either. Note that the comment on the function
> > says that it sets the flag *if something is reverted*. It does not say
> > that it sets the flag according to *whether something is reverted*.
> > So now the comment is correct :)
> Heh. It would be good if the comment was a bit more specific, though.

Please find attached v2 of the patch which clarifies the comment.

I've also added another testcase which reproduces the bug with property
instead of text conflict. (Also fixed by the patch.)


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.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Sat Mar 11 04:31:24 2006

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