Title: [284378] trunk/Tools
- Revision
- 284378
- Author
- jbed...@apple.com
- Date
- 2021-10-18 10:14:49 -0700 (Mon, 18 Oct 2021)
Log Message
[webkitscmpy] Allow repositories to define custom setup commands (Follow0-up)
https://bugs.webkit.org/show_bug.cgi?id=231345
<rdar://problem/83960249>
Unreviewed follow-up fix.
* Scripts/git-webkit: Do not specify OpenSource in Tools/Scripts path.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (284377 => 284378)
--- trunk/Tools/ChangeLog 2021-10-18 16:21:37 UTC (rev 284377)
+++ trunk/Tools/ChangeLog 2021-10-18 17:14:49 UTC (rev 284378)
@@ -1,3 +1,13 @@
+2021-10-18 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitscmpy] Allow repositories to define custom setup commands (Follow0-up)
+ https://bugs.webkit.org/show_bug.cgi?id=231345
+ <rdar://problem/83960249>
+
+ Unreviewed follow-up fix.
+
+ * Scripts/git-webkit: Do not specify OpenSource in Tools/Scripts path.
+
2021-10-18 Alex Christensen <achristen...@webkit.org>
Regression (r284304) : [ iOS 15 Release ] http/tests/privateClickMeasurement tests are failing
Modified: trunk/Tools/Scripts/git-webkit (284377 => 284378)
--- trunk/Tools/Scripts/git-webkit 2021-10-18 16:21:37 UTC (rev 284377)
+++ trunk/Tools/Scripts/git-webkit 2021-10-18 17:14:49 UTC (rev 284378)
@@ -56,7 +56,7 @@
'config', 'merge.changelog.driver',
'perl {} --merge-driver -c %O %A %B'.format(os.path.join(
os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))),
- 'OpenSource', 'Tools', 'Scripts', 'resolve-ChangeLogs',
+ 'Tools', 'Scripts', 'resolve-ChangeLogs',
)),
], capture_output=True, cwd=repository.root_path).returncode:
sys.stderr.write('Failed to set the git merging behaivor for changelogs...\n')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
