Bug 241709 - 'git webkit pr' failed (when adding new files?)
Summary: 'git webkit pr' failed (when adding new files?)
Status: NEW
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: Safari Technology Preview
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords: InRadar
Depends on:
Blocks: 239082
  Show dependency treegraph
 
Reported: 2022-06-16 22:16 PDT by Simon Fraser (smfr)
Modified: 2022-06-23 22:17 PDT (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Simon Fraser (smfr) 2022-06-16 22:16:34 PDT
I was on `main` with some added files, and `git webkit pr` failed with "Cannot rewrite branches: You have unstaged changes":

OpenSource % git webkit pr
'main' is not a pull request branch, enter issue URL or title of new issue: Update Intersection Observer WPTs
Issue description: Update Intersection Observer WPTs
What project should the bug be associated with?:
    1) Security
    2) WebKit
: 2
What component in 'WebKit' should the bug be associated with?:
    1) ANGLE
    2) Accessibility
    3) Animations
    4) Bindings
    5) CMake
    6) CSS
    7) Canvas
    8) Compositing
    9) DOM
    10) Evangelism
    11) Forms
    12) Frames
    13) HTML Editing
    14) History
    15) Images
    16) JavaScriptCore
    17) Layout and Rendering
    18) MathML
    19) Media
    20) New Bugs
    21) PDF
    22) Page Loading
    23) Platform
    24) Plug-ins
    25) Printing
    26) SVG
    27) Scrolling
    28) Service Workers
    29) Tables
    30) Text
    31) Tools / Tests
    32) UI Events
    33) WPE WebKit
    34) Web Audio
    35) Web Inspector
    36) Web Template Framework
    37) WebAssembly
    38) WebCore JavaScript
    39) WebCore Misc.
    40) WebDriver
    41) WebGL
    42) WebGPU
    43) WebKit API
    44) WebKit Misc.
    45) WebKit Process Model
    46) WebKit Website
    47) WebKit2
    48) WebKitGTK
    49) WebRTC
    50) WebXR
    51) Website Storage
    52) XML
    53) bmalloc
: 31
What version of 'WebKit' should the bug be associated with?:
    1) 312.x
    2) 412
    3) 412.x
    4) 416.x
    5) 417.x
    6) 418.x
    7) 419.x
    8) 420+
    9) 523.x (Safari 3)
    10) 525.x (Safari 3.1)
    11) 525.x (Safari 3.2)
    12) 528+ (Nightly build)
    13) Other
    14) Safari 8
    15) Safari 9
    16) Safari 10
    17) Safari 11
    18) Safari 12
    19) Safari 13
    20) Safari 14
    21) Safari 15
    22) Safari Technology Preview
    23) WebKit Local Build
    24) WebKit Nightly Build
: 24
Created 'https://bugs.webkit.org/show_bug.cgi?id=241708 Update Intersection Observer WPTs'
Switched to a new branch 'eng/Update-Intersection-Observer-WPTs'
Created the local development branch 'eng/Update-Intersection-Observer-WPTs'
Branch 'main' set up to track remote branch 'main' from 'origin'.
  Running status to find changed, added, or removed files.
  Reviewing diff to determine which lines changed.
  Extracting affected function names from source files.
  Change author: Simon Fraser <simon.fraser@apple.com>.
[eng/Update-Intersection-Observer-WPTs 47da82998ffe] Update Intersection Observer WPTs https://bugs.webkit.org/show_bug.cgi?id=241708
 Date: Thu Jun 16 22:13:37 2022 -0700
 13 files changed, 157 insertions(+), 28 deletions(-)
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-2-expected.txt
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-2.html
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds-expected.txt
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/intersection-observer/intersection-ratio-with-fractional-bounds.html
remote: Enumerating objects: 28, done.
remote: Counting objects: 100% (28/28), done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 28 (delta 11), reused 23 (delta 11), pack-reused 0
Unpacking objects: 100% (28/28), 277.86 KiB | 3.05 MiB/s, done.
From https://github.com/WebKit/WebKit
   6975dc56ad0e..ae412c0c44ff  main       -> main
   6975dc56ad0e..ae412c0c44ff  main       -> origin/main
From https://github.com/WebKit/WebKit
 * branch                      main       -> FETCH_HEAD
Successfully rebased and updated refs/heads/eng/Update-Intersection-Observer-WPTs.
Cannot rewrite branches: You have unstaged changes.
Failed to rebase 'eng/Update-Intersection-Observer-WPTs' on 'main,' please resolve conflicts
Comment 1 Radar WebKit Bug Importer 2022-06-23 22:17:13 PDT
<rdar://problem/95831052>