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/08/15 14:45:02 UTC
svn commit: r1157828 - in
/subversion/branches/fs-py/subversion/libsvn_fs_py: ./ tree.c
Author: hwright
Date: Mon Aug 15 12:45:02 2011
New Revision: 1157828
URL: http://svn.apache.org/viewvc?rev=1157828&view=rev
Log:
On the fs-py branch:
Merge changes merged to libsvn_fs_fs to libsvn_fs_py.
Modified:
subversion/branches/fs-py/subversion/libsvn_fs_py/ (props changed)
subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c
Propchange: subversion/branches/fs-py/subversion/libsvn_fs_py/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug 15 12:45:02 2011
@@ -0,0 +1,58 @@
+/subversion/branches/1.5.x-r30215/subversion/libsvn_fs_py:870312
+/subversion/branches/atomic-revprop/subversion/libsvn_fs_py:965046-1000689
+/subversion/branches/bdb-reverse-deltas/subversion/libsvn_fs_py:872050-872529
+/subversion/branches/diff-callbacks3/subversion/libsvn_fs_py:870059-870761
+/subversion/branches/diff-optimizations/subversion/libsvn_fs_py:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion/libsvn_fs_py:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/libsvn_fs_py:870728-871118
+/subversion/branches/double-delete/subversion/libsvn_fs_py:870511-872970
+/subversion/branches/explore-wc/subversion/libsvn_fs_py:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/subversion/libsvn_fs_py:871779-873302
+/subversion/branches/fs-py/subversion/libsvn_fs_fs:1154225-1157814
+/subversion/branches/fs-rep-sharing/subversion/libsvn_fs_py:869036-873803
+/subversion/branches/fsfs-pack/subversion/libsvn_fs_py:873717-874575
+/subversion/branches/gnome-keyring/subversion/libsvn_fs_py:870558-871410
+/subversion/branches/gpg-agent-password-store/subversion/libsvn_fs_py:1005036-1150766
+/subversion/branches/http-protocol-v2/subversion/libsvn_fs_py:874395-876041
+/subversion/branches/in-memory-cache/subversion/libsvn_fs_py:869829-871452
+/subversion/branches/integrate-cache-item-serialization/subversion/libsvn_fs_py:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion/libsvn_fs_py:998649-998852
+/subversion/branches/integrate-compression-level/subversion/libsvn_fs_py:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion/libsvn_fs_py:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion/libsvn_fs_py:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion/libsvn_fs_py:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion/libsvn_fs_py:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion/libsvn_fs_py:1068695-1072516
+/subversion/branches/integrate-txdelta-caching/subversion/libsvn_fs_py:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion/libsvn_fs_py:965496-984198
+/subversion/branches/issue-2843-dev/subversion/libsvn_fs_py:871432-874179
+/subversion/branches/issue-3000/subversion/libsvn_fs_py:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/libsvn_fs_py:873375-874084
+/subversion/branches/issue-3148-dev/subversion/libsvn_fs_py:875193-875204
+/subversion/branches/issue-3220-dev/subversion/libsvn_fs_py:872210-872226
+/subversion/branches/issue-3242-dev/subversion/libsvn_fs_py:879653-896436
+/subversion/branches/issue-3334-dirs/subversion/libsvn_fs_py:875156-875867
+/subversion/branches/issue-3668-3669/subversion/libsvn_fs_py:1031000-1035744
+/subversion/branches/kwallet/subversion/libsvn_fs_py:870785-871314
+/subversion/branches/log-g-performance/subversion/libsvn_fs_py:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/libsvn_fs_py:874525-874615
+/subversion/branches/nfc-nfd-aware-client/subversion/libsvn_fs_py:870276,870376
+/subversion/branches/performance/subversion/libsvn_fs_py:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985695,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232,1029335-1029336,1029339-
1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/subversion/libsvn_fs_py:956579-1033052
+/subversion/branches/ra_serf-digest-authn/subversion/libsvn_fs_py:875693-876404
+/subversion/branches/reintegrate-improvements/subversion/libsvn_fs_py:873853-874164
+/subversion/branches/revprop-packing/subversion/libsvn_fs_py:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/subversion/libsvn_fs_py:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_fs_py:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/subversion/libsvn_fs_py:918519-934609
+/subversion/branches/svnpatch-diff/subversion/libsvn_fs_py:865738-876477
+/subversion/branches/svnraisetc/subversion/libsvn_fs_py:874709-875149
+/subversion/branches/svnserve-logging/subversion/libsvn_fs_py:869828-870893
+/subversion/branches/tc-issue-3334/subversion/libsvn_fs_py:874697-874773
+/subversion/branches/tc-merge-notify/subversion/libsvn_fs_py:874017-874062
+/subversion/branches/tc-resolve/subversion/libsvn_fs_py:874191-874239
+/subversion/branches/tc_url_rev/subversion/libsvn_fs_py:874351-874483
+/subversion/branches/tree-conflicts/subversion/libsvn_fs_py:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/libsvn_fs_py:873926-874008
+/subversion/branches/uris-as-urls/subversion/libsvn_fs_py:1060426-1064427
+/subversion/trunk/subversion/libsvn_fs_py:1154223-1157792
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c?rev=1157828&r1=1157827&r2=1157828&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c Mon Aug 15 12:45:02 2011
@@ -2748,7 +2748,7 @@ prev_location(const char **prev_path,
const char *path,
apr_pool_t *pool)
{
- const char *copy_path, *copy_src_path, *remainder = "";
+ const char *copy_path, *copy_src_path, *remainder_path = "";
svn_fs_root_t *copy_root;
svn_revnum_t copy_src_rev;
@@ -2778,8 +2778,8 @@ prev_location(const char **prev_path,
SVN_ERR(fs_copied_from(©_src_rev, ©_src_path,
copy_root, copy_path, pool));
if (strcmp(copy_path, path) != 0)
- remainder = svn_relpath__is_child(copy_path, path, pool);
- *prev_path = svn_fspath__join(copy_src_path, remainder, pool);
+ remainder_path = svn_relpath__is_child(copy_path, path, pool);
+ *prev_path = svn_fspath__join(copy_src_path, remainder_path, pool);
*prev_rev = copy_src_rev;
return SVN_NO_ERROR;
}
@@ -3007,7 +3007,7 @@ history_prev(void *baton, apr_pool_t *po
if (copyroot_rev > commit_rev)
{
- const char *remainder;
+ const char *remainder_path;
const char *copy_dst, *copy_src;
svn_fs_root_t *copyroot_root;
@@ -3025,11 +3025,11 @@ history_prev(void *baton, apr_pool_t *po
one of these other criteria ... ### for now just fallback to
the old copy hunt algorithm. */
if (strcmp(path, copy_dst) == 0)
- remainder = "";
+ remainder_path = "";
else
- remainder = svn_relpath__is_child(copy_dst, path, pool);
+ remainder_path = svn_relpath__is_child(copy_dst, path, pool);
- if (remainder)
+ if (remainder_path)
{
/* If we get here, then our current path is the destination
of, or the child of the destination of, a copy. Fill
@@ -3038,7 +3038,7 @@ history_prev(void *baton, apr_pool_t *po
SVN_ERR(svn_fs_py__dag_get_copyfrom_path(©_src, node, pool));
dst_rev = copyroot_rev;
- src_path = svn_fspath__join(copy_src, remainder, pool);
+ src_path = svn_fspath__join(copy_src, remainder_path, pool);
}
}