% cd src/svn/16x/ ### --record-only should suffice % $svn merge -q -c r964349 --accept=postpone ../trunk/ % $svn ps -q k v ./ % $svn di --git --depth empty Index: . =================================================================== diff --git a/subversion/branches/1.6.x b/subversion/branches/1.6.x --- a/subversion/branches/1.6.x (revision 1033278) +++ b/subversion/branches/1.6.x (working copy)
Property changes on: subversion/branches/1.6.x ___________________________________________________________________ Modified: svn:mergeinfo Merged /subversion/trunk:r964349 Added: k ## -0,0 +1 ## +v % Shouldn't the propdiff of svn:mergeinfo be presented in the parseable /^##/ form? (in addition to being displayed in the human-readable form) The reason for this is so, if someone wants to apply the patch I just posted for me, they don't have to run 'svn merge --record-only' manually, but can have the svn:mergeinfo automagically set by 'svn patch' :-)
