You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/10/07 15:54:13 UTC
svn commit: r1005446 - in /subversion/trunk/tools/client-side/svnmucc:
svnmucc-test.py svnmucc.c
Author: cmpilato
Date: Thu Oct 7 13:54:13 2010
New Revision: 1005446
URL: http://svn.apache.org/viewvc?rev=1005446&view=rev
Log:
Um... make the new 'svnmucc propsetf' feature actually work.
(Last minute code "simplification" leads to impotence. Film at 11.)
* tools/client-side/svnmucc/svnmucc.c
(main): Only call handle_error() if there's an error to handle.
* tools/client-side/svnmucc/svnmucc-test.py
(main): Test "propsetf" functionality, too.
Reported by: Geoff Rowell <ge...@gmail.com>
Modified:
subversion/trunk/tools/client-side/svnmucc/svnmucc-test.py
subversion/trunk/tools/client-side/svnmucc/svnmucc.c
Modified: subversion/trunk/tools/client-side/svnmucc/svnmucc-test.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnmucc/svnmucc-test.py?rev=1005446&r1=1005445&r2=1005446&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnmucc/svnmucc-test.py (original)
+++ subversion/trunk/tools/client-side/svnmucc/svnmucc-test.py Thu Oct 7 13:54:13 2010
@@ -286,6 +286,13 @@ def main():
'propset', 'testprop', 'true', 'foo/z.c',
'propset', 'testprop', 'true', 'foo/foo')
+ # revision 19
+ run_svnmucc(['M /foo/z.c',
+ 'M /foo/foo',
+ ], #---------
+ 'propsetf', 'testprop', sys.argv[0], 'foo/z.c',
+ 'propsetf', 'testprop', sys.argv[0], 'foo/foo')
+
# Expected missing revision error
xrun_svnmucc(['svnmucc: \'a\' is not a revision'
], #---------
Modified: subversion/trunk/tools/client-side/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnmucc/svnmucc.c?rev=1005446&r1=1005445&r2=1005446&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/trunk/tools/client-side/svnmucc/svnmucc.c Thu Oct 7 13:54:13 2010
@@ -1023,8 +1023,10 @@ main(int argc, const char **argv)
if (++i == action_args->nelts)
insufficient(pool);
- handle_error(read_propvalue_file(&(action->prop_value),
- propval_file, pool), pool);
+ err = read_propvalue_file(&(action->prop_value), propval_file, pool);
+ if (err)
+ handle_error(err, pool);
+
action->action = ACTION_PROPSET;
}
}