WebKit Bugzilla
New
Browse
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
RESOLVED FIXED
45236
Teach svn-apply/unapply about svn:mergeinfo
https://bugs.webkit.org/show_bug.cgi?id=45236
Summary
Teach svn-apply/unapply about svn:mergeinfo
Daniel Bates
Reported
2010-09-04 16:18:42 PDT
Following up from
comment 7
in
bug 44336
<
https://bugs.webkit.org/show_bug.cgi?id=44336#c7
>, we should implement support for recognizing the svn:mergeinfo property so that patches that contain such information can be applied.
Attachments
Patch with unit tests
(11.18 KB, patch)
2010-09-04 16:41 PDT
,
Daniel Bates
no flags
Details
Formatted Diff
Diff
View All
Add attachment
proposed patch, testcase, etc.
Daniel Bates
Comment 1
2010-09-04 16:41:05 PDT
Created
attachment 66594
[details]
Patch with unit tests Adds support for recognizing the svn:mergeinfo property and ignore it. Because svn:mergeinfo is metadata that is used only by SVN and tends to be error-prone and/or nuisance (see remark (*)), we will ignore it for now. That is, when applying a patch that contains svn:mergeinfo info the changes to the svn:mergeinfo property will not be applied. (*) See "Parting Thoughts" of <
http://www.collab.net/community/subversion/articles/merge-info.html
>.
Daniel Bates
Comment 2
2010-09-04 16:50:21 PDT
I should add that I don't really use svn merge and hence could be biased on its benefit. I am open to suggestions on whether we should keep this information.
Martin Robinson
Comment 3
2010-09-04 17:03:54 PDT
Comment on
attachment 66594
[details]
Patch with unit tests Looks sane.
Daniel Bates
Comment 4
2010-09-04 18:12:25 PDT
Comment on
attachment 66594
[details]
Patch with unit tests Clearing flags on attachment: 66594 Committed
r66800
: <
http://trac.webkit.org/changeset/66800
>
Daniel Bates
Comment 5
2010-09-04 18:12:32 PDT
All reviewed patches have been landed. Closing bug.
Note
You need to
log in
before you can comment on or make changes to this bug.
Top of Page
Format For Printing
XML
Clone This Bug