You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Hyrum K. Wright" <hy...@mail.utexas.edu> on 2007/12/13 23:51:58 UTC

Re: svn commit: r28472 - in trunk: . subversion/libsvn_client subversion/tests/cmdline

pburba@tigris.org wrote:
> Author: pburba
> Date: Thu Dec 13 15:42:01 2007
> New Revision: 28472
> 
> Log:
> Merge the correct-copy-mergeinfo branch (r28402:28462) to trunk.
> 
> Now only WC->WC copies/moves create empty mergeinfo on the copy
> destination if no explicit mergeinfo existed on the source.  The three other
> copy varieties (WC->URL, URL->WC, URL->URL) *can* result in empty mergeinfo
> on the destination, but only if it the source explicitly had it to start
> with.
> 
> Modified:
>    trunk/build.conf
>    trunk/subversion/libsvn_client/copy.c
>    trunk/subversion/tests/cmdline/copy_tests.py
>    trunk/subversion/tests/cmdline/merge_tests.py
>    trunk/subversion/tests/cmdline/revert_tests.py
>    trunk/subversion/tests/cmdline/switch_tests.py
>    trunk/subversion/tests/cmdline/update_tests.py
> 
> Modified: trunk/build.conf
> URL: http://svn.collab.net/viewvc/svn/trunk/build.conf?pathrev=28472&r1=28471&r2=28472
> ==============================================================================
> --- trunk/build.conf	(original)
> +++ trunk/build.conf	Thu Dec 13 15:42:01 2007
> @@ -98,6 +98,14 @@
>          subversion/tests/cmdline/authz_tests.py
>          subversion/tests/cmdline/depth_tests.py
>          subversion/tests/cmdline/svndumpfilter_tests.py
> +test-scripts =
> +        subversion/tests/cmdline/merge_tests.py
> +        subversion/tests/cmdline/revert_tests.py
> +        subversion/tests/cmdline/merge_authz_tests.py
> +        subversion/tests/cmdline/update_tests.py
> +        subversion/tests/cmdline/copy_tests.py
> +        subversion/tests/cmdline/switch_tests.py
> +
[...]

Is there a reason to redefine test-scripts here?  I assume it's a
holdover from a debugging session...

-Hyrum


RE: svn commit: r28472 - in trunk: . subversion/libsvn_client subversion/tests/cmdline

Posted by Paul Burba <pb...@collab.net>.
> -----Original Message-----
> From: Hyrum K. Wright [mailto:hyrum_wright@mail.utexas.edu] 
> Sent: Thursday, December 13, 2007 6:52 PM
> To: dev@subversion.tigris.org; pburba@tigris.org
> Subject: Re: svn commit: r28472 - in trunk: . 
> subversion/libsvn_client subversion/tests/cmdline
> 
> pburba@tigris.org wrote:
> > Author: pburba
> > Date: Thu Dec 13 15:42:01 2007
> > New Revision: 28472
> > 
> > Log:
> > Merge the correct-copy-mergeinfo branch (r28402:28462) to trunk.
> > 
> > Now only WC->WC copies/moves create empty mergeinfo on the copy 
> > destination if no explicit mergeinfo existed on the source. 
>  The three 
> > other copy varieties (WC->URL, URL->WC, URL->URL) *can* result in 
> > empty mergeinfo on the destination, but only if it the source 
> > explicitly had it to start with.
> > 
> > Modified:
> >    trunk/build.conf
> >    trunk/subversion/libsvn_client/copy.c
> >    trunk/subversion/tests/cmdline/copy_tests.py
> >    trunk/subversion/tests/cmdline/merge_tests.py
> >    trunk/subversion/tests/cmdline/revert_tests.py
> >    trunk/subversion/tests/cmdline/switch_tests.py
> >    trunk/subversion/tests/cmdline/update_tests.py
> > 
> > Modified: trunk/build.conf
> > URL: 
> > 
> http://svn.collab.net/viewvc/svn/trunk/build.conf?pathrev=28472&r1=284
> > 71&r2=28472 
> > 
> ==============================================================
> ================
> > --- trunk/build.conf	(original)
> > +++ trunk/build.conf	Thu Dec 13 15:42:01 2007
> > @@ -98,6 +98,14 @@
> >          subversion/tests/cmdline/authz_tests.py
> >          subversion/tests/cmdline/depth_tests.py
> >          subversion/tests/cmdline/svndumpfilter_tests.py
> > +test-scripts =
> > +        subversion/tests/cmdline/merge_tests.py
> > +        subversion/tests/cmdline/revert_tests.py
> > +        subversion/tests/cmdline/merge_authz_tests.py
> > +        subversion/tests/cmdline/update_tests.py
> > +        subversion/tests/cmdline/copy_tests.py
> > +        subversion/tests/cmdline/switch_tests.py
> > +
> [...]
> 
> Is there a reason to redefine test-scripts here?  I assume 
> it's a holdover from a debugging session...

It's exactly that, fixed in r28474.  Thanks for the sharp eye!

Paul

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