[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-08 04:33:00 CET

> > 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...

After a couple false starts I think I have a decent fix.
New patch attached, including both bugfix and testcase.

I await your feedback!
Thanks,
-Ed

[[[
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): New test.
   (test_list): Add new test.
]]]

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

Received on Wed Mar 8 04:33:24 2006

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