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

RE: svn commit: r27032 - in trunk/subversion/tests/cmdline: . svntest

From: Paul Burba <pburba_at_collab.net>
Date: 2007-10-09 16:21:14 CEST

> -----Original Message-----
> From: Kamesh Jayachandran
> Sent: Tuesday, October 09, 2007 10:03 AM
> To: Paul Burba
> Cc: David Glasser; dev@subversion.tigris.org
> Subject: Re: svn commit: r27032 - in
> trunk/subversion/tests/cmdline: . svntest
>
>
> > Kamesh,
> >
> > You made the test "pass" by changing the expected output,
> but what was
> > wrong with the expected output? The current behavior is
> exactly the
> > problem with notifications spelled out here:
> >
>
> Based on our discussion[1] yesterday, I changed the expected output.
>
> [1]http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=130882
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=130873

Kamesh,

Sorry, I don't see the connection. [1] is about the path a notification
mentions. The change you made in r27032 was to the revision range the
notification prints:

--- trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ trunk/subversion/tests/cmdline/merge_tests.py Mon Oct 8
23:58:37 2007
@@ -7972,7 +7972,7 @@
                                      A_url + '/D/gamma' + '@4',
                                      Acopy_gamma_path)
 
- svntest.actions.run_and_verify_svn(None, expected_merge_output(3,
+ svntest.actions.run_and_verify_svn(None, expected_merge_output(2,
                                      'D ' + Acopy_gamma_path + '\n',
5),
                                      [], 'merge', '-r1:5', '--force',
                                      A_url, Acopy_path)

Closely related issues yes, they are both dealing with merge
notifications, but still separate concepts yes?

Regardless, I think if we just focus on the outcome of this thread,

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=130880

then my concerns here will be addressed one way or another. (Also, it
was mentioned in #dev recently that our other thread discussing these
same issues, "Re: svn commit: r26803 - in trunk/subversion:
libsvn_client tests/cmdline", had become so long and convoluted that you
and I were probably the only ones following it!)

Paul

P.S. Now I must step back from notifications at least for today,
desparately need to finish Issue #2818. So I'm crawling into a hole for
a bit...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 9 16:25:32 2007

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