[Svnmerge] Fwd: svn commit: r18673 - trunk/contrib/client-side

[Blair Zajac]

http://svn.collab.net/viewvc/svn?rev=18673&view=rev

Blair

Begin forwarded message:

> From: blair at tigris.org
> Date: March 1, 2006 7:22:32 PM PST
> To: svn at subversion.tigris.org
> Subject: svn commit: r18673 - trunk/contrib/client-side
> Reply-To: dev at subversion.tigris.org, blair at tigris.org
>
> Author: blair
> Date: Wed Mar  1 21:22:31 2006
> New Revision: 18673
>
> Modified:
>    trunk/contrib/client-side/svnmerge_test.py
>
> Log:
> Fix the bidirectional test case in svnmerge_test.py to work with svn
> 1.2.x as well as 1.3.x since svn 1.2.x does not produce property
> conflicts, and since the current test code expects it, the test fails.
>
> Patch by: Raman Gupta <rocketraman at fastmail.fm>
>
> * contrib/client-side/svnmerge_test.py
>   (TestCase_TestRepo.testBidirectionalMerges)
>     Remove an assertion on resolved output.
>
>
> Modified: trunk/contrib/client-side/svnmerge_test.py
> Url: http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/ 
> svnmerge_test.py?rev=18673&p1=trunk/contrib/client-side/ 
> svnmerge_test.py&p2=trunk/contrib/client-side/ 
> svnmerge_test.py&r1=18672&r2=18673
> ====================================================================== 
> ========
> --- trunk/contrib/client-side/svnmerge_test.py	(original)
> +++ trunk/contrib/client-side/svnmerge_test.py	Wed Mar  1 21:22:31  
> 2006
> @@ -527,9 +527,9 @@
>          # due to the attempted merge from trunk of the addition of  
> the
>          # svnmerge-integrated property, which already exists in the
>          # branch since 'svnmerge.py init' was run in it.  So just
> -        # resolve it, as it currently has the correct value.
> -        self.launch("svn resolved .",
> -                    match=r"Resolved conflicted state of '\.'")
> +        # resolve it, as it currently has the correct value (only on
> +        # svn 1.3.x, so do not execute a match assertion).
> +        self.launch("svn resolved .")
>
>          self.launch("svn commit -F svnmerge-commit-message.txt",
>                      match=r"Committed revision 17")
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe at subversion.tigris.org
> For additional commands, e-mail: svn-help at subversion.tigris.org
>