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

On Fri, Apr 9, 2010 at 18:38, Stefan Sperling wrote: > On Fri, Apr 09, 2010 at 06:27:18PM -0400, Greg Stein wrote: >> On Fri, Apr 9, 2010 at 16:54, Stefan Sperling wrote: >> > On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote: >> >> On Fri, Apr 9, 2010 at 11:46,   wrote: >> >> >... >> >>

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

On Fri, Apr 09, 2010 at 06:27:18PM -0400, Greg Stein wrote: > On Fri, Apr 9, 2010 at 16:54, Stefan Sperling wrote: > > On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote: > >> On Fri, Apr 9, 2010 at 11:46,   wrote: > >> >... > >> > +++ subversion/trunk/subversion/tests/cmdline/merge_tests.

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

On Fri, Apr 9, 2010 at 16:54, Stefan Sperling wrote: > On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote: >> On Fri, Apr 9, 2010 at 11:46,   wrote: >> >... >> > +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Apr  9 >> > 15:46:17 2010 >> > @@ -18792,7 +18792,7 @@ def rei

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

On Fri, Apr 09, 2010 at 03:44:19PM -0400, Greg Stein wrote: > On Fri, Apr 9, 2010 at 11:46, 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(

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

On Fri, Apr 9, 2010 at 11:46, 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, {})