Re: [PATCH] wc-replacements branch: Another test for issue 2135

On 9/6/05, Ivan Zhakov <chemodax@gmail.com> wrote:> On 9/5/05, Erik Huelsmann <ehuels@gmail.com> wrote:> > Hi Ivan!> >> > I had your mail marked, but there's no patch attached ....> Sorry, I forget it. Check now:> [[> Add test for issue 2135 (bug in reverse merge when replacing a file)> It is like merge_file_replace (in merge_tests.py), but reverts file> instead of commit.> > * subversion/tests/clients/cmdline/revert_tests.py> (revert_file_merge_replace_with_history): New test for issue 2135.> (test_list): Add revert_file_merge_replace_with_history test and mark> it with XFail.> ]]> > > > PS: should I apply to trunk or to wc-replacements? If it works on> > trunk - as XFail - I should probably apply to trunk...> I don't know policy about XFail tests, but now it fails on> wc-replacements and trunk.> > > > On 9/5/05, Ivan Zhakov <chemodax@gmail.com> wrote:> > > Hi!> > >> > > There is another test for issue 2135.> > >> > > [[> > > Add test for issue 2135 (bug in reverse merge when replacing a file)> > > It
 is like merge_file_replace (in merge_tests.py), but reverts file> > > instead of commit.> > >> > > * subversion/tests/clients/cmdline/revert_tests.py> > > (revert_file_merge_replace_with_history): New test for issue 2135.> > > (test_list): Add revert_file_merge_replace_with_history test and mark> > > it with XFail.> > > ]]> > >
Committed in r16082 (on the wc-replacements branch).
Thanks!
bye,
Erik.
Received on Wed Sep 7 19:51:02 2005