hwright@tigris.org wrote:
> Author: hwright
> Date: Fri Jun 22 15:04:41 2007
> New Revision: 25510
>
> Log:
> Update the 'svn log -g' tests by checking for too many revisions, as well as not
> enough revisions. Also, split the merge_sensitive_log_branching_revision() test
> into too separate tests, to help diagnos a bug with 'svn log -g'.
>
> * subversion/tests/cmdline/log_tests.py
> (check_merge_results): Ensure that the revisions in expected_merges exist in
> log_chain, and that log_chain does not have any extra revisions.
> (merge_sensitive_log_single_revision, merge_sensitive_log_branching_revision):
> Update expected_merges to reflect the changes to check_merge_results().
> (merge_sensitive_log_non_branching_revision): New test, taken from
> merge_sensitive_log_branching_revision().
Hyrum,
this change is failing on the Mac and Windows buildslaves. More
specifically, log_tests 17 and 19 are failing.
I checked the output of "log -g log_tests-17\trunk" on my Windows box -
where the tests pass - and my mac, the output is clearly different:
C:\>svn log -g -r 14
C:\devel\subversion\trunk\Debug\subversion\tests\cmdline\svn-test-work\working_copies\log_tests-17\trunk
------------------------------------------------------------------------
r14 | jrandom | 2007-06-07 19:29:48 +0200 (Thu, 07 Jun 2007) | 1 line
Merge branches/b to trunk
------------------------------------------------------------------------
r13 | jrandom | 2007-06-07 19:28:54 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14
Modify 'gamma' on branches/b
------------------------------------------------------------------------
r12 | jrandom | 2007-06-07 19:27:29 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14
Merge branches/a to branches/b
------------------------------------------------------------------------
r11 | jrandom | 2007-06-07 19:24:53 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14, r12
Added 'xi' to branches/a, made a few other changes.
------------------------------------------------------------------------
This is what the tests expect.
On the Mac:
$ svn log -g -r 14
subversion/tests/cmdline/svn-test-work/working_copies/log_tests-17/trunk
------------------------------------------------------------------------
r14 | jrandom | 2007-06-07 19:29:48 +0200 (Thu, 07 Jun 2007) | 1 line
Merge branches/b to trunk
------------------------------------------------------------------------
r13 | jrandom | 2007-06-07 19:28:54 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14
Modify 'gamma' on branches/b
------------------------------------------------------------------------
r12 | jrandom | 2007-06-07 19:27:29 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14
Merge branches/a to branches/b
------------------------------------------------------------------------
r11 | jrandom | 2007-06-07 19:24:53 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14, r12
Added 'xi' to branches/a, made a few other changes.
------------------------------------------------------------------------
r10 | jrandom | 2007-06-07 19:09:34 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14, r12
Create branches/b from trunk
------------------------------------------------------------------------
r9 | jrandom | 2007-06-07 19:09:08 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14, r12
Wording change in upsilon
------------------------------------------------------------------------
r8 | jrandom | 2007-06-07 19:07:17 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14, r12
Block r7 from merging to trunk
------------------------------------------------------------------------
r6 | jrandom | 2007-06-07 18:57:08 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14, r12
Merged branches/a to trunk
------------------------------------------------------------------------
r11 | jrandom | 2007-06-07 19:24:53 +0200 (Thu, 07 Jun 2007) | 1 line
Result of a merge from: r14
Added 'xi' to branches/a, made a few other changes.
------------------------------------------------------------------------
I don't now the expected behavior well enough to fix it, can you have a
look?
thanks,
Lieven
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 24 18:47:11 2007