Bug 45236 - Teach svn-apply/unapply about svn:mergeinfo
Summary: Teach svn-apply/unapply about svn:mergeinfo
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Daniel Bates
Depends on:
Reported: 2010-09-04 16:18 PDT by Daniel Bates
Modified: 2010-09-04 18:12 PDT (History)
3 users (show)

See Also:

Patch with unit tests (11.18 KB, patch)
2010-09-04 16:41 PDT, Daniel Bates
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Bates 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.
Comment 1 Daniel Bates 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>.
Comment 2 Daniel Bates 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.
Comment 3 Martin Robinson 2010-09-04 17:03:54 PDT
Comment on attachment 66594 [details]
Patch with unit tests

Looks sane.
Comment 4 Daniel Bates 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>
Comment 5 Daniel Bates 2010-09-04 18:12:32 PDT
All reviewed patches have been landed.  Closing bug.