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

Re: svn commit: r932469 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 9 Apr 2010 23:38:46 +0100

On Fri, Apr 09, 2010 at 06:27:18PM -0400, Greg Stein wrote:
> On Fri, Apr 9, 2010 at 16:54, Stefan Sperling <stsp_at_elego.de> wrote:
> > On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote:
> >> On Fri, Apr 9, 2010 at 11:46, <rhuijben_at_apache.org> wrote:
> >> >...
> >> > +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr 9 15:46:17 2010
> >> > @@ -18792,7 +18792,7 @@ def reintegrate_with_subtree_merges(sbox
> >> > 'D/H/omega' : Item("New content"),
> >> > })
> >> > expected_A_skip = wc.State(A_COPY_path, {})
> >> > - svntest.actions.run_and_verify_merge(A_path, None, None,
> >> > + svntest.actions.run_and_verify_svn(A_path, None, None,
> >> > sbox.repo_url + '/A_COPY', None,
> >> > expected_output,
> >> > expected_mergeinfo_output,
> >>
> >> What's this?
> >
> > What's what?
>
> Look at the code! It changed from run_and_verify_merge() to
> run_and_verify_svn(). And there is no svn subcommand. Certainly
> nothing that says "do a merge".

sbutler pointed this out to me, too.

I was just trying to get you to explain the problem you were
seeing. Mission accomplished :)

Stefan
Received on 2010-04-10 00:39:25 CEST

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