subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1577217 - /subversion/branches/fsfs-lock-many/notes/
Date Thu, 13 Mar 2014 16:06:40 GMT
Author: philip
Date: Thu Mar 13 16:06:39 2014
New Revision: 1577217

URL: http://svn.apache.org/r1577217
Log:
On fsfs-lock-many branch: a corrupt working copy with svn:mergeinfo
missing from 'notes/' meant that the sync merges from trunk (r1576824,
r1573603 and r1572541) did not get recorded on 'notes/' on the branch.

* notes: Subtree merge to fix svn:mergeinfo, no other changes.

Modified:
    subversion/branches/fsfs-lock-many/notes/   (props changed)

Propchange: subversion/branches/fsfs-lock-many/notes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar 13 16:06:39 2014
@@ -0,0 +1,38 @@
+/subversion/branches/1.5.x-r30215/notes:870312
+/subversion/branches/bdb-reverse-deltas/notes:872050-872529
+/subversion/branches/diff-callbacks3/notes:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default/notes:870728-871118
+/subversion/branches/double-delete/notes:870511-872970
+/subversion/branches/explore-wc/notes: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/notes:871779-873302
+/subversion/branches/fs-rep-sharing/notes:869036-873803
+/subversion/branches/fsfs-pack/notes:873717-874575
+/subversion/branches/gnome-keyring/notes:870558-871410
+/subversion/branches/http-protocol-v2/notes:874395-876041
+/subversion/branches/in-memory-cache/notes:869829-871452
+/subversion/branches/issue-2843-dev/notes:871432-874179
+/subversion/branches/issue-3000/notes:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/notes:873375-874084
+/subversion/branches/issue-3148-dev/notes:875193-875204
+/subversion/branches/issue-3220-dev/notes:872210-872226
+/subversion/branches/issue-3242-dev/notes:879653-896436
+/subversion/branches/issue-3334-dirs/notes:875156-875867
+/subversion/branches/kwallet/notes:870785-871314
+/subversion/branches/log-g-performance/notes:870941-871032
+/subversion/branches/merge-skips-obstructions/notes:874525-874615
+/subversion/branches/nfc-nfd-aware-client/notes:870276,870376
+/subversion/branches/ra_serf-digest-authn/notes:875693-876404
+/subversion/branches/reintegrate-improvements/notes:873853-874164
+/subversion/branches/subtree-mergeinfo/notes:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/notes:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/notes:918519-934609
+/subversion/branches/svnpatch-diff/notes:865738-876477
+/subversion/branches/svnraisetc/notes:874709-875149
+/subversion/branches/svnserve-logging/notes:869828-870893
+/subversion/branches/tc-issue-3334/notes:874697-874773
+/subversion/branches/tc-merge-notify/notes:874017-874062
+/subversion/branches/tc-resolve/notes:874191-874239
+/subversion/branches/tc_url_rev/notes:874351-874483
+/subversion/branches/tree-conflicts/notes:868291-873154
+/subversion/branches/tree-conflicts-notify/notes:873926-874008
+/subversion/trunk/notes:1571736-1576815



Mime
View raw message