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 2012/01/31 13:07:07 UTC
svn commit: r1238422 [2/2] - in /subversion/branches/ev2-export: ./
subversion/bindings/javahl/ subversion/bindings/swig/python/libsvn_swig_py/
subversion/bindings/swig/python/tests/ subversion/include/
subversion/include/private/ subversion/libsvn_cli...
Modified: subversion/branches/ev2-export/subversion/tests/cmdline/svntest/factory.py
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/cmdline/svntest/factory.py?rev=1238422&r1=1238421&r2=1238422&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/tests/cmdline/svntest/factory.py (original)
+++ subversion/branches/ev2-export/subversion/tests/cmdline/svntest/factory.py Tue Jan 31 12:07:06 2012
@@ -1612,6 +1612,11 @@ class TestFactory:
def ensure_path_var(self, wc, pathelements):
"Given a path in a working copy, make sure we have a variable for it."
+
+ # special case: if a path is '.', simply use wc_dir.
+ if pathelements == ['.']:
+ return wc.py, wc.realpath
+
name = "_".join(pathelements)
if wc.suffix is not None:
Modified: subversion/branches/ev2-export/tools/client-side/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/client-side/svnmucc/svnmucc.c?rev=1238422&r1=1238421&r2=1238422&view=diff
==============================================================================
--- subversion/branches/ev2-export/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/branches/ev2-export/tools/client-side/svnmucc/svnmucc.c Tue Jan 31 12:07:06 2012
@@ -660,9 +660,9 @@ execute(const apr_array_header_t *action
for (i = 0; i < actions->nelts; ++i)
{
struct action *action = APR_ARRAY_IDX(actions, i, struct action *);
+ const char *path1, *path2;
switch (action->action)
{
- const char *path1, *path2;
case ACTION_MV:
path1 = subtract_anchor(anchor, action->path[0], pool);
path2 = subtract_anchor(anchor, action->path[1], pool);
Modified: subversion/branches/ev2-export/tools/dist/backport.pl
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/dist/backport.pl?rev=1238422&r1=1238421&r2=1238422&view=diff
==============================================================================
--- subversion/branches/ev2-export/tools/dist/backport.pl (original)
+++ subversion/branches/ev2-export/tools/dist/backport.pl Tue Jan 31 12:07:06 2012
@@ -194,7 +194,7 @@ sub handle_entry {
# TODO: this changes ./STATUS, which we're reading below, but
# on my system the loop in main() doesn't seem to care.
- merge %entry if prompt;
+ merge %entry if $ENV{YES} or prompt;
1;
}