Attachment #298143 for bug #165953

View Details Raw Unified Return to Bug 165953

| Differences between



2017-01-05  Jonathan Bedard  <jbedard@apple.com>

        svn-apply failed to apply a patch (deleting file with svn property)
        https://bugs.webkit.org/show_bug.cgi?id=165953

        Reviewed by NOBODY (OOPS!).

        * Scripts/VCSUtils.pm:
        (parseDiff): Ignore svn property when deleting file.

2017-01-05  Keith Rollin  <krollin@apple.com>

        Add WebCore::URL::protocolHostAndPort

Lines 1235-1241 sub parseDiff($$;$) Tools/Scripts/VCSUtils.pm_sec1
- Tools/Scripts/VCSUtils.pm -1 / +1 lines
1235	$headerStartRegEx = $unifiedDiffStartRegEx;	1235	$headerStartRegEx = $unifiedDiffStartRegEx;
1236	}	1236	}
1237		1237
1238	if ($line =~ $svnPropertiesStartRegEx) {	1238	if ($line =~ $svnPropertiesStartRegEx && !($svnText =~ m/\+\+\+(.*)(nonexistent)/)) {
1239	my $propertyPath = $1;	1239	my $propertyPath = $1;
1240	if ($svnPropertiesHashRef \|\| $headerHashRef && ($propertyPath ne $headerHashRef->{indexPath})) {	1240	if ($svnPropertiesHashRef \|\| $headerHashRef && ($propertyPath ne $headerHashRef->{indexPath})) {
1241	# This is the start of the second diff in the while loop, which happens to	1241	# This is the start of the second diff in the while loop, which happens to

Return to Bug 165953

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +10 lines
		1	2017-01-05 Jonathan Bedard <jbedard@apple.com>
		2
		3	svn-apply failed to apply a patch (deleting file with svn property)
		4	https://bugs.webkit.org/show_bug.cgi?id=165953
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Scripts/VCSUtils.pm:
		9	(parseDiff): Ignore svn property when deleting file.
		10
1	2017-01-05 Keith Rollin <krollin@apple.com>	11	2017-01-05 Keith Rollin <krollin@apple.com>
2		12
3	Add WebCore::URL::protocolHostAndPort	13	Add WebCore::URL::protocolHostAndPort