Stefan Sperling wrote on Wed, Nov 10, 2010 at 18:48:39 +0100: > On Wed, Nov 10, 2010 at 03:10:10AM +0200, Daniel Shahaf wrote: > > % 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' :-) > > Good idea. Please file an isssue.
Filed <http://subversion.tigris.org/issues/show_bug.cgi?id=3747>. > This isn't specific to --git. svn patch in general doesn't manually > diff mergeinfo properties. It just calls the existing mergeinfo diffing > code, which produces the output you see above.
