[webkit-changes] [WebKit/WebKit] bb0606: [git-webkit] Only reset local main when it contai...

[Jonathan Bedard]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: bb0606c86b4a7b22131b69fd7d3de9edfac2dcda
      https://github.com/WebKit/WebKit/commit/bb0606c86b4a7b22131b69fd7d3de9edfac2dcda
  Author: Jonathan Bedard <jbedard at apple.com>
  Date:   2023-05-25 (Thu, 25 May 2023)

  Changed paths:
    M Tools/Scripts/libraries/webkitscmpy/setup.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py

  Log Message:
  -----------
   [git-webkit] Only reset local main when it contains local commits
https://bugs.webkit.org/enter_bug.cgi?product=WebKit
rdar://109860518

Reviewed by Dewei Zhu.

* Tools/Scripts/libraries/webkitscmpy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py: Mock --is-ancestor.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/pull_request.py:
(PullRequest.pull_request_branch_point): Only reset local branch ref if the local branch ref
is not tracking the remote branch.

Canonical link: https://commits.webkit.org/264544@main