On May 15, 2011, at 19:19 , Bert Huijben wrote: > > >> -----Original Message----- >> From: sbut...@apache.org [mailto:sbut...@apache.org] >> Sent: zondag 15 mei 2011 19:10 >> To: comm...@subversion.apache.org >> Subject: svn commit: r1103461 - >> /subversion/trunk/subversion/tests/cmdline/revert_tests.py >> >> Author: sbutler >> Date: Sun May 15 17:10:22 2011 >> New Revision: 1103461 >> >> URL: http://svn.apache.org/viewvc?rev=1103461&view=rev >> Log: >> Following up on Bert's r1102143, tweak a revert test. >> >> subversion/tests/cmdline/revert_tests.py >> (revert_tree_conflicts_with_replacements): Update no longer skips >> tree conflict victims, so remove the second update command. Expect >> "replaced" status for the victims. Remove @XFail. > > The related issue #3879 is called > "Tree conflict (incoming replacement) has strange status and revert behavior". > > I think I fixed at least some parts of what made it strange, but did this > resolve the 'strange status behavior' for you? > > Only you can answer that :-) > > Bert >
Yes, you did. There were a couple of status commands that used to get a strange error. They don't anymore. I resolved the issue as fixed. That "shadow" update is pretty cool! Steve -- Stephen Butler | Senior Consultant elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany tel: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
