You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/02/16 18:58:00 UTC
svn commit: r1071330 - in /subversion/branches/1.6.x: ./ subversion/tests/
subversion/tests/cmdline/ subversion/tests/cmdline/svntest/
subversion/tests/libsvn_fs/ subversion/tests/libsvn_fs_base/
subversion/tests/libsvn_fs_fs/ subversion/tests/libsvn_r...
Author: hwright
Date: Wed Feb 16 17:58:00 2011
New Revision: 1071330
URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
Log:
Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
included below:
* r1051744, r1051745, r1053185, r1053241
Add additional assertions to the unit tests that use
svn_fs_commit_txn() and svn_repos_svn_commit_txn().
Justification:
Having additional assertions on svn_fs_commit_txn() and
svn_repos_svn_commit_txn() is good.
Branch:
^/subversion/branches/1.6.x-r1051744
More unit tests exist in trunk than the branch, so this branch
just ignores the rejected hunks.
This branch also has:
r1053185 merged into it
r1053241, an "original" commit that copies the definition of
SVN_TEST_ASSERT() into svn_test.h. This is an "original"
commit since there are no clean merges that would bring this
over.
Diff:
svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
^/subversion/branches/1.6.x-r1051744@HEAD
Notes:
Merge all the changes on the 1.6.x-r1051744 branch and then merge
r1051745.
Votes:
+1: blair, danielsh, stsp
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py (props changed)
subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py (props changed)
subversion/branches/1.6.x/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/1.6.x/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/changes-test.c
subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/fs-base-test.c
subversion/branches/1.6.x/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/1.6.x/subversion/tests/libsvn_repos/repos-test.c
subversion/branches/1.6.x/subversion/tests/svn_test.h
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 17:58:00 2011
@@ -29,6 +29,7 @@
/subversion/branches/1.6.x-no-wcng-check:1022248-1035322
/subversion/branches/1.6.x-r1002094:1002741-1002773
/subversion/branches/1.6.x-r1024269:1024274-1035798
+/subversion/branches/1.6.x-r1051744:1052424-1071327
/subversion/branches/1.6.x-r36178:877876-877884
/subversion/branches/1.6.x-r36252:876328-876788
/subversion/branches/1.6.x-r37622:877699-877993
@@ -100,4 +101,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,
879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051751,1053208,1058722
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,
879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957,1028108,1031165,1031
186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 17:58:00 2011
@@ -29,6 +29,7 @@
/subversion/branches/1.6.x-no-wcng-check/CHANGES:1022248-1035322
/subversion/branches/1.6.x-r1002094/CHANGES:1002741-1002773
/subversion/branches/1.6.x-r1024269/CHANGES:1024274-1035798
+/subversion/branches/1.6.x-r1051744/CHANGES:1052424-1071327
/subversion/branches/1.6.x-r36178/CHANGES:877876-877884
/subversion/branches/1.6.x-r36252/CHANGES:876328-876788
/subversion/branches/1.6.x-r37622/CHANGES:877699-877993
@@ -98,4 +99,4 @@
/subversion/branches/tc_url_rev/CHANGES:874351-874483
/subversion/branches/tree-conflicts/CHANGES:868291-873154
/subversion/branches/tree-conflicts-notify/CHANGES:873926-874008
-/subversion/trunk/CHANGES:837701-841355,875962-1038588,1038792,1041438,1051632,1051638,1051751,1053208,1058722
+/subversion/trunk/CHANGES:837701-841355,875962-1038588,1038792,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Wed Feb 16 17:58:00 2011
@@ -350,30 +350,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1051744, r1051745, r1053185, r1053241
- Add additional assertions to the unit tests that use
- svn_fs_commit_txn() and svn_repos_svn_commit_txn().
- Justification:
- Having additional assertions on svn_fs_commit_txn() and
- svn_repos_svn_commit_txn() is good.
- Branch:
- ^/subversion/branches/1.6.x-r1051744
- More unit tests exist in trunk than the branch, so this branch
- just ignores the rejected hunks.
- This branch also has:
- r1053185 merged into it
- r1053241, an "original" commit that copies the definition of
- SVN_TEST_ASSERT() into svn_test.h. This is an "original"
- commit since there are no clean merges that would bring this
- over.
- Diff:
- svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
- ^/subversion/branches/1.6.x-r1051744@HEAD
- Notes:
- Merge all the changes on the 1.6.x-r1051744 branch and then merge
- r1051745.
- Votes:
- +1: blair, danielsh, stsp
-
-
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/merge_tests.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 17:58:00 2011
@@ -29,6 +29,7 @@
/subversion/branches/1.6.x-no-wcng-check/subversion/tests/cmdline/merge_tests.py:1022248-1035322
/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/merge_tests.py:1002741-1002773
/subversion/branches/1.6.x-r1024269/subversion/tests/cmdline/merge_tests.py:1024274-1035798
+/subversion/branches/1.6.x-r1051744/subversion/tests/cmdline/merge_tests.py:1052424-1071327
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/merge_tests.py:877876-877884
/subversion/branches/1.6.x-r36252/subversion/tests/cmdline/merge_tests.py:876328-876788
/subversion/branches/1.6.x-r37622/subversion/tests/cmdline/merge_tests.py:877699-877993
@@ -100,4 +101,4 @@
/subversion/branches/tree-conflicts/subversion/tests/cmdline/merge_tests.py:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/merge_tests.py:873926-874008
/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py:953878
-/subversion/trunk/subversion/tests/cmdline/merge_tests.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,
877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,87
9271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984565,984928,984931,991534,996884,997026,997070,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1028108,1031165,1031186,1032808,1033166,1033665,1033685,10
33921,1034557,1035745,1038792,1041438,1051632,1051638,1051751,1053208,1058722
+/subversion/trunk/subversion/tests/cmdline/merge_tests.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,
877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,87
9271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964767,965405,965469,965508,979045,979429,981921,984565,984928,984931,991534,996884,997026,997070,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1028108,1031165,1031186,1032808,1033166,1033665,1033685,10
33921,1034557,1035745,1038792,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722
Propchange: subversion/branches/1.6.x/subversion/tests/cmdline/svntest/main.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 16 17:58:00 2011
@@ -29,6 +29,7 @@
/subversion/branches/1.6.x-no-wcng-check/subversion/tests/cmdline/svntest/main.py:1022248-1035322
/subversion/branches/1.6.x-r1002094/subversion/tests/cmdline/svntest/main.py:1002741-1002773
/subversion/branches/1.6.x-r1024269/subversion/tests/cmdline/svntest/main.py:1024274-1035798
+/subversion/branches/1.6.x-r1051744/subversion/tests/cmdline/svntest/main.py:1052424-1071327
/subversion/branches/1.6.x-r36178/subversion/tests/cmdline/svntest/main.py:877876-877884
/subversion/branches/1.6.x-r36252/subversion/tests/cmdline/svntest/main.py:876328-876788
/subversion/branches/1.6.x-r37622/subversion/tests/cmdline/svntest/main.py:877699-877993
@@ -100,5 +101,5 @@
/subversion/branches/tc_url_rev/subversion/tests/cmdline/svntest/main.py:874351-874483
/subversion/branches/tree-conflicts/subversion/tests/cmdline/svntest/main.py:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/svntest/main.py:873926-874008
-/subversion/trunk/subversion/tests/cmdline/svntest/main.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319
,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,8
79201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005
446,1022675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1038792,1041438,1051632,1051638,1051751,1053208,1058722
+/subversion/trunk/subversion/tests/cmdline/svntest/main.py:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319
,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,8
79201,879271,879293,879357,879375-879376,879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,962377-962378,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005
446,1022675,1024269,1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1038792,1041438,1051632,1051638,1051744-1051745,1051751,1053185,1053208,1058722
/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py:991972
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_fs/fs-test.c?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_fs/fs-test.c Wed Feb 16 17:58:00 2011
@@ -54,6 +54,7 @@
* EXPECTED_CONFLICT. If they don't match, return error.
*
* If a conflict is expected but the commit succeeds anyway, return
+ * error. If the commit fails but does not provide an error, return
* error.
*/
static svn_error_t *
@@ -94,13 +95,24 @@ test_commit_txn(svn_revnum_t *new_rev,
conflict, expected_conflict);
}
}
- else if (err) /* commit failed, but not due to conflict */
+ else if (err) /* commit may have succeeded, but always report an error */
{
- return svn_error_quick_wrap
- (err, "commit failed due to something other than a conflict");
+ if (SVN_IS_VALID_REVNUM(*new_rev))
+ return svn_error_quick_wrap
+ (err, "commit succeeded but something else failed");
+ else
+ return svn_error_quick_wrap
+ (err, "commit failed due to something other than a conflict");
}
- else /* err == NULL, so commit succeeded */
+ else /* err == NULL, commit should have succeeded */
{
+ if (! SVN_IS_VALID_REVNUM(*new_rev))
+ {
+ return svn_error_create
+ (SVN_ERR_FS_GENERAL, NULL,
+ "commit failed but no error was returned");
+ }
+
if (expected_conflict)
{
return svn_error_createf
@@ -1150,6 +1162,7 @@ basic_commit(const char **msg,
/* Commit it. */
SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev));
/* Make sure it's a different revision than before. */
if (after_rev == before_rev)
@@ -1226,6 +1239,7 @@ test_tree_node_validation(const char **m
/* Go ahead and commit the tree, and destroy the txn object. */
SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev));
/* Carefully validate that tree in the new revision, now. */
SVN_ERR(svn_fs_revision_root(&revision_root, fs, after_rev, subpool));
@@ -1287,6 +1301,7 @@ test_tree_node_validation(const char **m
/* Go ahead and commit the tree, and destroy the txn object. */
SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev));
/* Carefully validate that tree in the new revision, now. */
SVN_ERR(svn_fs_revision_root(&revision_root, fs, after_rev, subpool));
@@ -2707,6 +2722,7 @@ delete(const char **msg,
/* Commit the greek tree. */
SVN_ERR(svn_fs_commit_txn(NULL, &new_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(new_rev));
/* Create new transaction. */
SVN_ERR(svn_fs_begin_txn(&txn, fs, new_rev, pool));
@@ -2935,6 +2951,7 @@ commit_date(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
after_commit = apr_time_now();
@@ -2989,6 +3006,7 @@ check_old_revisions(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/* Modify and commit iota a few times, then test to see if we can
@@ -3024,6 +3042,7 @@ not a dot, will pass from the law until
SVN_ERR(svn_test__set_file_contents
(txn_root, "iota", iota_contents_2, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/* Revision 3. */
@@ -3032,6 +3051,7 @@ not a dot, will pass from the law until
SVN_ERR(svn_test__set_file_contents
(txn_root, "iota", iota_contents_3, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/* Revision 4. */
@@ -3040,6 +3060,7 @@ not a dot, will pass from the law until
SVN_ERR(svn_test__set_file_contents
(txn_root, "iota", iota_contents_4, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/* Revision 5. */
@@ -3048,6 +3069,7 @@ not a dot, will pass from the law until
SVN_ERR(svn_test__set_file_contents
(txn_root, "iota", iota_contents_5, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/* Revision 6. */
@@ -3056,6 +3078,7 @@ not a dot, will pass from the law until
SVN_ERR(svn_test__set_file_contents
(txn_root, "iota", iota_contents_6, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/* Revision 7. */
@@ -3064,6 +3087,7 @@ not a dot, will pass from the law until
SVN_ERR(svn_test__set_file_contents
(txn_root, "iota", iota_contents_7, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(rev));
svn_pool_clear(subpool);
/** Now check the full Greek Tree in all of those revisions,
@@ -3366,6 +3390,7 @@ check_all_revisions(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 1 */
@@ -3423,6 +3448,7 @@ check_all_revisions(const char **msg,
subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 2 */
@@ -3474,6 +3500,7 @@ check_all_revisions(const char **msg,
subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 3 */
@@ -3523,6 +3550,7 @@ check_all_revisions(const char **msg,
SVN_ERR(svn_test__txn_script_exec(txn_root, script_entries, 2, subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 4 */
@@ -3699,6 +3727,7 @@ file_integrity_helper(apr_size_t filesiz
(&wh_func, &wh_baton, txn_root, "bigfile", NULL, NULL, subpool));
SVN_ERR(svn_txdelta_send_string(&contents, wh_func, wh_baton, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
checksum_list[youngest_rev] = checksum;
svn_pool_clear(subpool);
@@ -3714,6 +3743,7 @@ file_integrity_helper(apr_size_t filesiz
(&wh_func, &wh_baton, txn_root, "bigfile", NULL, NULL, subpool));
SVN_ERR(svn_txdelta_send_string(&contents, wh_func, wh_baton, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
checksum_list[youngest_rev] = checksum;
svn_pool_clear(subpool);
@@ -3728,6 +3758,7 @@ file_integrity_helper(apr_size_t filesiz
(&wh_func, &wh_baton, txn_root, "bigfile", NULL, NULL, subpool));
SVN_ERR(svn_txdelta_send_string(&contents, wh_func, wh_baton, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
checksum_list[youngest_rev] = checksum;
svn_pool_clear(subpool);
@@ -3744,6 +3775,7 @@ file_integrity_helper(apr_size_t filesiz
(&wh_func, &wh_baton, txn_root, "bigfile", NULL, NULL, subpool));
SVN_ERR(svn_txdelta_send_string(&contents, wh_func, wh_baton, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
checksum_list[youngest_rev] = checksum;
svn_pool_clear(subpool);
@@ -3763,6 +3795,7 @@ file_integrity_helper(apr_size_t filesiz
SVN_ERR(svn_txdelta_send_string
(&contents, wh_func, wh_baton, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
checksum_list[youngest_rev] = checksum;
svn_pool_clear(subpool);
@@ -3883,6 +3916,7 @@ check_root_revision(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Root node's revision should be the same as YOUNGEST_REV. */
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, subpool));
@@ -3904,6 +3938,7 @@ check_root_revision(const char **msg,
apr_psprintf(subpool, "iota version %d", i + 2), subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Root node's revision should be the same as YOUNGEST_REV. */
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, subpool));
@@ -4018,6 +4053,7 @@ test_node_created_rev(const char **msg,
/* Now commit the transaction. */
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Now, we have a new revision, and all paths in it should have a
created rev of 1. Verify this. */
@@ -4057,6 +4093,7 @@ test_node_created_rev(const char **msg,
SVN_ERR(verify_path_revs(txn_root, path_revs, 20, subpool));
/* commit transaction */
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* get a revision root for the new revision */
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, subpool));
/* verify created revs */
@@ -4081,6 +4118,7 @@ test_node_created_rev(const char **msg,
SVN_ERR(verify_path_revs(txn_root, path_revs, 20, subpool));
/* commit transaction */
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* get a revision root for the new revision */
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, subpool));
/* verify created revs */
@@ -4147,18 +4185,21 @@ check_related(const char **msg,
SVN_ERR(svn_fs_make_file(txn_root, "A", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A", "1", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 2 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A", "2", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 3 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A", "3", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 4 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -4171,6 +4212,7 @@ check_related(const char **msg,
SVN_ERR(svn_fs_copy(rev_root, "A", txn_root, "C", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "C", "4", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 5 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -4178,6 +4220,7 @@ check_related(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "B", "5", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "C", "5", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 6 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -4188,6 +4231,7 @@ check_related(const char **msg,
SVN_ERR(svn_fs_copy(rev_root, "B", txn_root, "D", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "D", "5", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 7 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -4196,12 +4240,14 @@ check_related(const char **msg,
SVN_ERR(svn_fs_make_file(txn_root, "E", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "E", "7", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 8 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "E", "8", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 9 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -4210,12 +4256,14 @@ check_related(const char **msg,
SVN_ERR(svn_fs_copy(rev_root, "E", txn_root, "F", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "F", "9", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 10 */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "F", "10", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/*** Step II: Exhaustively verify relationship between all nodes in
@@ -4334,6 +4382,7 @@ branch_test(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, spool));
SVN_ERR(svn_test__create_greek_tree(txn_root, spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 2: Copy A/D/G/rho to A/D/G/rho2. ***/
@@ -4342,6 +4391,7 @@ branch_test(const char **msg,
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, spool));
SVN_ERR(svn_fs_copy(rev_root, "A/D/G/rho", txn_root, "A/D/G/rho2", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 3: Copy A/D/G to A/D/G2. ***/
@@ -4350,6 +4400,7 @@ branch_test(const char **msg,
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, spool));
SVN_ERR(svn_fs_copy(rev_root, "A/D/G", txn_root, "A/D/G2", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 4: Copy A/D to A/D2. ***/
@@ -4358,6 +4409,7 @@ branch_test(const char **msg,
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, spool));
SVN_ERR(svn_fs_copy(rev_root, "A/D", txn_root, "A/D2", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 5: Edit all the rho's! ***/
@@ -4381,6 +4433,7 @@ branch_test(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D2/G2/rho2",
"Edited text.", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_destroy(spool);
@@ -4816,6 +4869,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 2: Modify A/D/H/chi and A/B/E/alpha. */
@@ -4824,6 +4878,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "2", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/B/E/alpha", "2", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 3: Copy A/D to A/D2, and create A/D2/floop new. */
@@ -4833,6 +4888,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_fs_copy(root, "A/D", txn_root, "A/D2", subpool));
SVN_ERR(svn_fs_make_file(txn_root, "A/D2/floop", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 4: Modify A/D/H/chi and A/D2/H/chi. */
@@ -4841,6 +4897,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "4", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D2/H/chi", "4", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 5: Delete A/D2/G, add A/B/E/alfalfa. */
@@ -4849,6 +4906,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_fs_delete(txn_root, "A/D2/G", subpool));
SVN_ERR(svn_fs_make_file(txn_root, "A/B/E/alfalfa", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 6: Restore A/D2/G (from version 4). */
@@ -4857,6 +4915,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_fs_revision_root(&root, fs, 4, subpool));
SVN_ERR(svn_fs_copy(root, "A/D2/G", txn_root, "A/D2/G", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 7: Move A/D2 to A/D (replacing it), Add a new file A/D2,
@@ -4870,6 +4929,7 @@ node_origin_rev(const char **msg,
SVN_ERR(svn_fs_make_file(txn_root, "A/D2", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/floop", "7", subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Now test some origin revisions. */
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_fs/locks-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_fs/locks-test.c?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_fs/locks-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_fs/locks-test.c Wed Feb 16 17:58:00 2011
@@ -121,6 +121,7 @@ lock_only(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -167,6 +168,7 @@ lookup_lock_by_path(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -217,6 +219,7 @@ attach_lock(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -276,6 +279,7 @@ get_locks(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -411,6 +415,7 @@ basic_lock(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -469,6 +474,7 @@ lock_credentials(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -492,6 +498,7 @@ lock_credentials(const char **msg,
/* Try to commit the file change. Should fail, because we're nobody. */
err = svn_fs_commit_txn(&conflict, &newrev, txn, pool);
+ SVN_TEST_ASSERT(! SVN_IS_VALID_REVNUM(newrev));
if (! err)
return svn_error_create
(SVN_ERR_TEST_FAILED, NULL,
@@ -504,6 +511,7 @@ lock_credentials(const char **msg,
/* Try to commit the file change. Should fail, because we're 'hortense'. */
err = svn_fs_commit_txn(&conflict, &newrev, txn, pool);
+ SVN_TEST_ASSERT(! SVN_IS_VALID_REVNUM(newrev));
if (! err)
return svn_error_create
(SVN_ERR_TEST_FAILED, NULL,
@@ -516,6 +524,7 @@ lock_credentials(const char **msg,
/* Try to commit the file change. Should fail, because there's no token. */
err = svn_fs_commit_txn(&conflict, &newrev, txn, pool);
+ SVN_TEST_ASSERT(! SVN_IS_VALID_REVNUM(newrev));
if (! err)
return svn_error_create
(SVN_ERR_TEST_FAILED, NULL,
@@ -527,6 +536,7 @@ lock_credentials(const char **msg,
/* Commit should now succeed. */
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
return SVN_NO_ERROR;
}
@@ -566,6 +576,7 @@ final_lock_check(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* Make a new transaction and delete "/A" */
SVN_ERR(svn_fs_begin_txn2(&txn, fs, newrev, SVN_FS_TXN_CHECK_LOCKS, pool));
@@ -584,6 +595,7 @@ final_lock_check(const char **msg,
/* Try to commit the transaction. Should fail, because a child of
the deleted directory is locked by someone else. */
err = svn_fs_commit_txn(&conflict, &newrev, txn, pool);
+ SVN_TEST_ASSERT(! SVN_IS_VALID_REVNUM(newrev));
if (! err)
return svn_error_create
(SVN_ERR_TEST_FAILED, NULL,
@@ -594,6 +606,7 @@ final_lock_check(const char **msg,
SVN_ERR(svn_fs_set_access(fs, access));
SVN_ERR(svn_fs_access_add_lock_token(access, mylock->token));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
return SVN_NO_ERROR;
}
@@ -630,6 +643,7 @@ lock_dir_propchange(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* Become 'bubba' and lock "/A/D/G/rho". */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -650,6 +664,7 @@ lock_dir_propchange(const char **msg,
/* Commit should succeed; this means we're doing a non-recursive
lock-check on directory, rather than a recursive one. */
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
return SVN_NO_ERROR;
}
@@ -687,6 +702,7 @@ lock_name_reservation(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* Become 'bubba' and lock imaginary path "/A/D/G2/blooga". */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -824,6 +840,7 @@ lock_expiration(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* Make a new transaction and change rho. */
SVN_ERR(svn_fs_begin_txn2(&txn, fs, newrev, SVN_FS_TXN_CHECK_LOCKS, pool));
@@ -846,6 +863,7 @@ lock_expiration(const char **msg,
/* Try to commit. Should fail because we're 'nobody', and the lock
hasn't expired yet. */
err = svn_fs_commit_txn(&conflict, &newrev, txn, pool);
+ SVN_TEST_ASSERT(! SVN_IS_VALID_REVNUM(newrev));
if (! err)
return svn_error_create
(SVN_ERR_TEST_FAILED, NULL,
@@ -882,6 +900,7 @@ lock_expiration(const char **msg,
}
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
return SVN_NO_ERROR;
}
@@ -915,6 +934,7 @@ lock_break_steal_refresh(const char **ms
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* Become 'bubba' and lock "/A/D/G/rho". */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
@@ -1002,6 +1022,7 @@ lock_out_of_date(const char **msg,
/* Create the greek tree and commit it. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* Commit a small change to /A/D/G/rho, creating revision 2. */
SVN_ERR(svn_fs_begin_txn2(&txn, fs, newrev, SVN_FS_TXN_CHECK_LOCKS, pool));
@@ -1009,6 +1030,7 @@ lock_out_of_date(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "/A/D/G/rho",
"new contents", pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &newrev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(newrev));
/* We are now 'bubba'. */
SVN_ERR(svn_fs_create_access(&access, "bubba", pool));
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/changes-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/changes-test.c?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/changes-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/changes-test.c Wed Feb 16 17:58:00 2011
@@ -595,6 +595,7 @@ changes_fetch_ordering(const char **msg,
SVN_ERR(svn_test__txn_script_exec(txn_root, script_entries, 5, subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/*** REVISION 2: Delete and add some stuff, non-depth-first. ***/
@@ -615,6 +616,7 @@ changes_fetch_ordering(const char **msg,
SVN_ERR(svn_test__txn_script_exec(txn_root, script_entries, 7, subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/*** TEST: We should have only three changes, the deletion of 'file1'
@@ -663,6 +665,7 @@ changes_fetch_ordering(const char **msg,
SVN_ERR(svn_test__txn_script_exec(txn_root, script_entries, 5, subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/*** REVISION 4: Do the same stuff as in revision 2, but use a copy
@@ -687,6 +690,7 @@ changes_fetch_ordering(const char **msg,
SVN_ERR(svn_fs_make_dir(txn_root, "dir4", subpool));
}
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/*** TEST: We should have only three changes, the deletion of 'file1'
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/fs-base-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/fs-base-test.c?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/fs-base-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_fs_base/fs-base-test.c Wed Feb 16 17:58:00 2011
@@ -476,6 +476,7 @@ abort_txn(const char **msg,
SVN_ERR(svn_fs_begin_txn(&txn4, fs, 0, pool));
SVN_ERR(svn_fs_txn_name(&txn4_name, txn4, pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &new_rev, txn4, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(new_rev));
err = svn_fs_abort_txn(txn4, pool);
if (! err)
return svn_error_create
@@ -874,6 +875,7 @@ delete(const char **msg,
/* Commit the greek tree. */
SVN_ERR(svn_fs_commit_txn(NULL, &new_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(new_rev));
/* Create new transaction. */
SVN_ERR(svn_fs_begin_txn(&txn, fs, new_rev, pool));
@@ -1208,6 +1210,7 @@ create_within_copy(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, spool));
SVN_ERR(svn_test__create_greek_tree(txn_root, spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 2: Copy A/D to A/D3 ***/
@@ -1216,6 +1219,7 @@ create_within_copy(const char **msg,
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, spool));
SVN_ERR(svn_fs_copy(rev_root, "A/D", txn_root, "A/D3", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 3: Copy A/D/G to A/D/G2 ***/
@@ -1224,6 +1228,7 @@ create_within_copy(const char **msg,
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, spool));
SVN_ERR(svn_fs_copy(rev_root, "A/D/G", txn_root, "A/D/G2", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 4: Copy A/D to A/D2 and create up and I in the existing
@@ -1239,6 +1244,7 @@ create_within_copy(const char **msg,
SVN_ERR(svn_fs_make_dir(txn_root, "A/D2/G2/I", spool));
SVN_ERR(svn_fs_make_file(txn_root, "A/D2/G2/up", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/*** Revision 5: Create A/D3/down and A/D3/J ***/
@@ -1247,6 +1253,7 @@ create_within_copy(const char **msg,
SVN_ERR(svn_fs_make_file(txn_root, "A/D3/down", spool));
SVN_ERR(svn_fs_make_dir(txn_root, "A/D3/J", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
{
@@ -1338,6 +1345,7 @@ skip_deltas(const char **msg,
SVN_ERR(svn_fs_make_file(txn_root, "f", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "f", f->data, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
svn_pool_clear(subpool);
@@ -1352,6 +1360,7 @@ skip_deltas(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "f", f->data, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_deltify_revision(fs, youngest_rev, subpool));
svn_pool_clear(subpool);
}
@@ -1416,6 +1425,7 @@ redundant_copy(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, pool));
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* In a transaction, copy A to Z. */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, pool));
@@ -1491,6 +1501,7 @@ orphaned_textmod_change(const char **msg
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 2: Start to change "iota", but don't complete the work. */
@@ -1507,6 +1518,7 @@ orphaned_textmod_change(const char **msg
testing that misbehaving callers don't introduce more damage to
the repository than they have to. */
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Fetch changed paths for the youngest revision. We should find none. */
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_fs_fs/fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_fs_fs/fs-pack-test.c?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_fs_fs/fs-pack-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_fs_fs/fs-pack-test.c Wed Feb 16 17:58:00 2011
@@ -132,6 +132,7 @@ create_packed_filesystem(const char *dir
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev));
/* Revisions 2-11: A bunch of random changes. */
iterpool = svn_pool_create(subpool);
@@ -145,6 +146,7 @@ create_packed_filesystem(const char *dir
iterpool),
iterpool));
SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, iterpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev));
}
svn_pool_destroy(iterpool);
svn_pool_destroy(subpool);
@@ -363,6 +365,7 @@ commit_packed_fs(const char **msg,
"How much better is it to get wisdom than gold! and to get "
"understanding rather to be chosen than silver!", pool));
SVN_ERR(svn_fs_commit_txn(&conflict, &after_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(after_rev));
return SVN_NO_ERROR;
}
Modified: subversion/branches/1.6.x/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/libsvn_repos/repos-test.c?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/1.6.x/subversion/tests/libsvn_repos/repos-test.c Wed Feb 16 17:58:00 2011
@@ -91,6 +91,7 @@ dir_deltas(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 1 */
@@ -152,6 +153,7 @@ dir_deltas(const char **msg,
subpool));
}
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 2 */
@@ -206,6 +208,7 @@ dir_deltas(const char **msg,
SVN_ERR(svn_test__txn_script_exec(txn_root, script_entries, 4, subpool));
}
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 3 */
@@ -259,6 +262,7 @@ dir_deltas(const char **msg,
txn_root, "A/B/epsilon",
subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/***********************************************************************/
/* REVISION 4 */
@@ -398,6 +402,7 @@ node_tree_delete_under_copy(const char *
/* Create and commit the greek tree. */
SVN_ERR(svn_test__create_greek_tree(txn_root, pool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Now, commit again, this time after copying a directory, and then
deleting some paths under that directory. */
@@ -408,6 +413,7 @@ node_tree_delete_under_copy(const char *
SVN_ERR(svn_fs_delete(txn_root, "Z/D/G/rho", pool));
SVN_ERR(svn_fs_delete(txn_root, "Z/D/H", pool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, pool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Now, we run the node_tree editor code, and see that a) it doesn't
bomb out, and b) that our nodes are all good. */
@@ -545,6 +551,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, spool));
SVN_ERR(svn_test__create_greek_tree(txn_root, spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 2 - mu, alpha, omega */
@@ -554,6 +561,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/B/E/alpha", "2", spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/omega", "2", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 3 - iota, lambda, psi, omega */
@@ -564,6 +572,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/psi", "3", spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/omega", "3", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 4 - iota, beta, gamma, pi, rho */
@@ -575,6 +584,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/G/pi", "4", spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/G/rho", "4", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 5 - mu, alpha, tau, chi */
@@ -585,6 +595,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/G/tau", "5", spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "5", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 6 - move A/D to A/Z */
@@ -594,6 +605,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_fs_copy(rev_root, "A/D", txn_root, "A/Z", spool));
SVN_ERR(svn_fs_delete(txn_root, "A/D", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 7 - edit A/Z/G/pi */
@@ -601,6 +613,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/Z/G/pi", "7", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 8 - move A/Z back to A/D, edit iota */
@@ -611,6 +624,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_fs_delete(txn_root, "A/Z", spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "iota", "8", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 9 - copy A/D/G to A/D/Q */
@@ -619,6 +633,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_fs_revision_root(&rev_root, fs, youngest_rev, spool));
SVN_ERR(svn_fs_copy(rev_root, "A/D/G", txn_root, "A/D/Q", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Revision 10 - edit A/D/Q/pi and A/D/Q/rho */
@@ -627,6 +642,7 @@ revisions_changed(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/Q/pi", "10", spool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/Q/rho", "10", spool));
SVN_ERR(svn_fs_commit_txn(NULL, &youngest_rev, txn, spool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(spool);
/* Now, it's time to verify our results. */
@@ -793,6 +809,7 @@ node_locations(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Move a file. Rev 2. */
@@ -801,6 +818,7 @@ node_locations(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_fs_copy(root, "/A/mu", txn_root, "/mu.new", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
{
struct locations_info info[] =
{
@@ -848,6 +866,7 @@ node_locations2(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_fs_make_dir(txn_root, "/foo", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 2: Copy /foo to /bar, and add /bar/baz */
@@ -857,6 +876,7 @@ node_locations2(const char **msg,
SVN_ERR(svn_fs_copy(root, "/foo", txn_root, "/bar", subpool));
SVN_ERR(svn_fs_make_file(txn_root, "/bar/baz", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 3: Modify /bar/baz */
@@ -864,6 +884,7 @@ node_locations2(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "/bar/baz", "brrt", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 4: Modify /bar/baz again */
@@ -871,6 +892,7 @@ node_locations2(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "/bar/baz", "bzzz", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Now, check locations. */
@@ -1061,6 +1083,7 @@ rmlocks(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
SVN_ERR(svn_fs_create_access(&fs_access, "user1", pool));
@@ -1413,6 +1436,7 @@ commit_editor_authz(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Load the authz rules for the greek tree. */
authz_contents =
@@ -1631,6 +1655,7 @@ commit_continue_txn(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_txn_name(&txn_name, txn, subpool));
@@ -1817,6 +1842,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 2: Modify A/D/H/chi and A/B/E/alpha. */
@@ -1825,6 +1851,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "2", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/B/E/alpha", "2", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 3: Copy A/D to A/D2. */
@@ -1833,6 +1860,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_fs_revision_root(&root, fs, youngest_rev, subpool));
SVN_ERR(svn_fs_copy(root, "A/D", txn_root, "A/D2", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 4: Modify A/D/H/chi and A/D2/H/chi. */
@@ -1841,6 +1869,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D/H/chi", "4", subpool));
SVN_ERR(svn_test__set_file_contents(txn_root, "A/D2/H/chi", "4", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 5: Delete A/D2/G. */
@@ -1848,6 +1877,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_fs_delete(txn_root, "A/D2/G", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 6: Restore A/D2/G (from version 4). */
@@ -1856,6 +1886,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_fs_revision_root(&root, fs, 4, subpool));
SVN_ERR(svn_fs_copy(root, "A/D2/G", txn_root, "A/D2/G", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 7: Move A/D2 to A/D (replacing it). */
@@ -1866,6 +1897,7 @@ node_location_segments(const char **msg,
SVN_ERR(svn_fs_copy(root, "A/D2", txn_root, "A/D", subpool));
SVN_ERR(svn_fs_delete(txn_root, "A/D2", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Check locations for /@HEAD. */
@@ -2010,6 +2042,7 @@ reporter_depth_exclude(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Revision 2: make a bunch of changes */
@@ -2032,6 +2065,7 @@ reporter_depth_exclude(const char **msg,
subpool));
}
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
svn_pool_clear(subpool);
/* Confirm the contents of r2. */
@@ -2369,6 +2403,7 @@ get_logs(const char **msg,
SVN_ERR(svn_fs_txn_root(&txn_root, txn, subpool));
SVN_ERR(svn_test__create_greek_tree(txn_root, subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Revision 2: Tweak A/mu and A/B/E/alpha. */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -2378,6 +2413,7 @@ get_logs(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/B/E/alpha",
"Revision 2", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
/* Revision 3: Tweak A/B/E/alpha and A/B/E/beta. */
SVN_ERR(svn_fs_begin_txn(&txn, fs, youngest_rev, subpool));
@@ -2387,6 +2423,7 @@ get_logs(const char **msg,
SVN_ERR(svn_test__set_file_contents(txn_root, "A/B/E/beta",
"Revision 3", subpool));
SVN_ERR(svn_repos_fs_commit_txn(NULL, repos, &youngest_rev, txn, subpool));
+ SVN_TEST_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
for (start = 0; start <= youngest_rev; start++)
Modified: subversion/branches/1.6.x/subversion/tests/svn_test.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/tests/svn_test.h?rev=1071330&r1=1071329&r2=1071330&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/tests/svn_test.h (original)
+++ subversion/branches/1.6.x/subversion/tests/svn_test.h Wed Feb 16 17:58:00 2011
@@ -35,6 +35,17 @@ extern "C" {
#endif /* __cplusplus */
+/** Handy macro to test a condition, returning SVN_ERR_TEST_FAILED if FALSE
+ *
+ * This macro should be used in place of SVN_ERR_ASSERT() since we don't
+ * want to core-dump the test.
+ */
+#define SVN_TEST_ASSERT(expr) \
+ do { \
+ if (!(expr)) \
+ return svn_error_create(SVN_ERR_TEST_FAILED, NULL, #expr); \
+ } while (0)
+
/* Baton for any arguments that need to be passed from main() to svn
* test functions.
*/
Re: svn commit: r1071330 - in /subversion/branches/1.6.x: ./
subversion/tests/ subversion/tests/cmdline/
subversion/tests/cmdline/svntest/ subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs_base/ subversion/tests/libsvn_fs_fs/
subversion/tests/libsvn_r...
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Stefan Sperling wrote on Sat, Feb 19, 2011 at 12:49:45 +0100:
> On Sat, Feb 19, 2011 at 10:56:55AM +0200, Daniel Shahaf wrote:
> > hwright@apache.org wrote on Wed, Feb 16, 2011 at 17:58:00 -0000:
> > > Author: hwright
> > > Date: Wed Feb 16 17:58:00 2011
> > > New Revision: 1071330
> > >
> > > URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
> > > Log:
> > > Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
> > > included below:
> > >
> > > * r1051744, r1051745, r1053185, r1053241
> > > Add additional assertions to the unit tests that use
> > > svn_fs_commit_txn() and svn_repos_svn_commit_txn().
> > ...
> > > Diff:
> > > svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
> > > ^/subversion/branches/1.6.x-r1051744@HEAD
> > > Notes:
> > > Merge all the changes on the 1.6.x-r1051744 branch and then merge
> > > r1051745.
> > > Votes:
> > > +1: blair, danielsh, stsp
> >
> > What? There was a 'diff' command so I just used that. If the
> > instructions to merge are "Merge the branch, then merge another
> > revision", then I haven't reviewed the additional revision.
>
> I fell into the same trap and I've already complained about it.
> See http://svn.haxx.se/dev/archive-2011-02/0554.shtml
> and Blair's reply: http://svn.haxx.se/dev/archive-2011-02/0566.shtml
Oh! "*Not* was a large commit". I misread that as "Note", which is why
I noted here that I hadn't +1'd it.
OK -- having reviewed the change, I extend my +1 to cover r1051745 too.
Thanks :)
Re: svn commit: r1071330 - in /subversion/branches/1.6.x: ./
subversion/tests/ subversion/tests/cmdline/
subversion/tests/cmdline/svntest/ subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs_base/ subversion/tests/libsvn_fs_fs/
subversion/tests/libsvn_r...
Posted by Stefan Sperling <st...@elego.de>.
On Sat, Feb 19, 2011 at 10:56:55AM +0200, Daniel Shahaf wrote:
> hwright@apache.org wrote on Wed, Feb 16, 2011 at 17:58:00 -0000:
> > Author: hwright
> > Date: Wed Feb 16 17:58:00 2011
> > New Revision: 1071330
> >
> > URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
> > Log:
> > Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
> > included below:
> >
> > * r1051744, r1051745, r1053185, r1053241
> > Add additional assertions to the unit tests that use
> > svn_fs_commit_txn() and svn_repos_svn_commit_txn().
> ...
> > Diff:
> > svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
> > ^/subversion/branches/1.6.x-r1051744@HEAD
> > Notes:
> > Merge all the changes on the 1.6.x-r1051744 branch and then merge
> > r1051745.
> > Votes:
> > +1: blair, danielsh, stsp
>
> What? There was a 'diff' command so I just used that. If the
> instructions to merge are "Merge the branch, then merge another
> revision", then I haven't reviewed the additional revision.
I fell into the same trap and I've already complained about it.
See http://svn.haxx.se/dev/archive-2011-02/0554.shtml
and Blair's reply: http://svn.haxx.se/dev/archive-2011-02/0566.shtml
Re: svn commit: r1071330 - in /subversion/branches/1.6.x: ./
subversion/tests/ subversion/tests/cmdline/
subversion/tests/cmdline/svntest/ subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs_base/ subversion/tests/libsvn_fs_fs/
subversion/tests/libsvn_r...
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Wed, Feb 16, 2011 at 17:58:00 -0000:
> Author: hwright
> Date: Wed Feb 16 17:58:00 2011
> New Revision: 1071330
>
> URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
> Log:
> Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
> included below:
>
> * r1051744, r1051745, r1053185, r1053241
> Add additional assertions to the unit tests that use
> svn_fs_commit_txn() and svn_repos_svn_commit_txn().
...
> Diff:
> svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
> ^/subversion/branches/1.6.x-r1051744@HEAD
> Notes:
> Merge all the changes on the 1.6.x-r1051744 branch and then merge
> r1051745.
> Votes:
> +1: blair, danielsh, stsp
What? There was a 'diff' command so I just used that. If the
instructions to merge are "Merge the branch, then merge another
revision", then I haven't reviewed the additional revision.
Re: svn commit: r1071330 - in /subversion/branches/1.6.x: ./ subversion/tests/
subversion/tests/cmdline/ subversion/tests/cmdline/svntest/ subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs_base/ subversion/tests/libsvn_fs_fs/ subversion/tests/libsvn_r...
Posted by Blair Zajac <bl...@orcaware.com>.
On 02/16/2011 10:02 AM, Stefan Sperling wrote:
> On Wed, Feb 16, 2011 at 05:58:00PM -0000, hwright@apache.org wrote:
>> Author: hwright
>> Date: Wed Feb 16 17:58:00 2011
>> New Revision: 1071330
>>
>> URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
>> Log:
>> Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
>
>> Notes:
>> Merge all the changes on the 1.6.x-r1051744 branch and then merge
>> r1051745.
>
> Blair,
>
> just FYI, I nearly missed r1051745 during review because I was assuming that
> the backport branch contained the complete diff. I think it's a good
> idea to merge all relevant changes into the brackport branch if one exists.
>
> Stefan
Hey Stefan,
Sure, I could do that.
I wanted each commit separately reviewable, instead of reviewing some
monster backport branch, so this made it easier to review. Not that
r1051745 was a large commit in of itself. But it looks like it didn't
work that well :)
Blair
Re: svn commit: r1071330 - in /subversion/branches/1.6.x: ./
subversion/tests/ subversion/tests/cmdline/
subversion/tests/cmdline/svntest/ subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs_base/ subversion/tests/libsvn_fs_fs/
subversion/tests/libsvn_r...
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Feb 16, 2011 at 05:58:00PM -0000, hwright@apache.org wrote:
> Author: hwright
> Date: Wed Feb 16 17:58:00 2011
> New Revision: 1071330
>
> URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
> Log:
> Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
> Notes:
> Merge all the changes on the 1.6.x-r1051744 branch and then merge
> r1051745.
Blair,
just FYI, I nearly missed r1051745 during review because I was assuming that
the backport branch contained the complete diff. I think it's a good
idea to merge all relevant changes into the brackport branch if one exists.
Stefan
Re: svn commit: r1071330 - in /subversion/branches/1.6.x: ./
subversion/tests/ subversion/tests/cmdline/
subversion/tests/cmdline/svntest/ subversion/tests/libsvn_fs/
subversion/tests/libsvn_fs_base/ subversion/tests/libsvn_fs_fs/
subversion/tests/libsvn_r...
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Wed, Feb 16, 2011 at 17:58:00 -0000:
> Author: hwright
> Date: Wed Feb 16 17:58:00 2011
> New Revision: 1071330
>
> URL: http://svn.apache.org/viewvc?rev=1071330&view=rev
> Log:
> Merge r1051744, r1051745, r1053185, r1053241 from trunk, using the instructions
> included below:
>
> * r1051744, r1051745, r1053185, r1053241
> Add additional assertions to the unit tests that use
> svn_fs_commit_txn() and svn_repos_svn_commit_txn().
...
> Diff:
> svn diff -x-p ^/subversion/branches/1.6.x@1052423 \
> ^/subversion/branches/1.6.x-r1051744@HEAD
> Notes:
> Merge all the changes on the 1.6.x-r1051744 branch and then merge
> r1051745.
> Votes:
> +1: blair, danielsh, stsp
What? There was a 'diff' command so I just used that. If the
instructions to merge are "Merge the branch, then merge another
revision", then I haven't reviewed the additional revision.