Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Files changed doesn't properly reflect changes against non base branch #5545

Closed
lramos15 opened this issue Dec 12, 2023 · 5 comments 路 Fixed by #5546
Closed

Files changed doesn't properly reflect changes against non base branch #5545

lramos15 opened this issue Dec 12, 2023 · 5 comments 路 Fixed by #5546
Assignees
Labels
bug Issue identified by VS Code Team member as probable bug candidate Issue identified as probable candidate for fixing in the next release verified Verification succeeded

Comments

@lramos15
Copy link
Member

lramos15 commented Dec 12, 2023

Type: Bug

Using the VS Code repo as reference

  1. Create a branch off the release branch such as release/1.85
  2. Make some changes
  3. Create a PR
  4. 馃悰 The files changed view shows a ton of changes diffing between main and your branch rather than the proper base.
  5. Create PR and realize only your files changed
image

Extension version: 0.79.2023121209
VS Code version: Code - Insiders 1.86.0-insider (Universal) (72cb92fdc5d08101d65d59e4b1c046d397896dd2, 2023-12-12T05:37:56.079Z)
OS version: Darwin x64 23.1.0
Modes:

System Info
Item Value
CPUs Intel(R) Core(TM) i7-1068NG7 CPU @ 2.30GHz (8 x 2300)
GPU Status 2d_canvas: enabled
canvas_oop_rasterization: disabled_off
direct_rendering_display_compositor: disabled_off_ok
gpu_compositing: enabled
multiple_raster_threads: enabled_on
opengl: enabled_on
rasterization: enabled
raw_draw: disabled_off_ok
skia_graphite: disabled_off
video_decode: enabled
video_encode: enabled
webgl: enabled
webgl2: enabled
webgpu: enabled
Load (avg) 4, 4, 4
Memory (System) 32.00GB (7.79GB free)
Process Argv --crash-reporter-id 7170f6db-7270-442f-945e-4508c02991d4
Screen Reader no
VM 0%
A/B Experiments
vsliv695:30137379
vsins829:30139715
vsliv368cf:30146710
vsreu685:30147344
python383cf:30185419
vspor879:30202332
vspor708:30202333
vspor363:30204092
vslsvsres303:30308271
pythontb:30258533
vsc_aacf:30263846
pythonptprofiler:30281269
vshan820:30294714
vscod805cf:30301675
bridge0708:30335490
bridge0723:30353136
vsaa593:30376534
pythonvs932:30404738
py29gd2263:30784851
vsclangdf:30492506
c4g48928:30535728
dsvsc012cf:30540253
showlangstatbar:30737417
fixshowwlkth:30771523
showindicator:30805243
pythongtdpath:30726887
i26e3531:30792625
welcomedialog:30812478
pythonnosmt12:30779711
pythonidxpt:30768918
pythonnoceb:30776497
asynctok:30898717
dsvsc013:30777762
dsvsc014:30777825
pythonmpswarning:30901777
dsvsc015:30821418
pythontestfixt:30866404
pythonregdiag2:30902439
pyreplss1:30879911
pythonmypyd1:30859725
pythoncet0:30859736
pythontbext0:30879054
accentitlementst:30870582
dsvsc016:30879898
dsvsc017:30880771
dsvsc018:30880772
aa_t_chat:30882232

@alexr00 alexr00 added bug Issue identified by VS Code Team member as probable bug candidate Issue identified as probable candidate for fixing in the next release labels Dec 12, 2023
@alexr00 alexr00 added this to the November 2023 Recovery 1 milestone Dec 12, 2023
@alexr00
Copy link
Member

alexr00 commented Dec 12, 2023

Caused by the refactor I did to support the Copilot sparkle action.

@lramos15
Copy link
Member Author

This bug seems back
image

image

@alexr00
Copy link
Member

alexr00 commented Jun 3, 2024

I'm not able to repro this. If you see it again, can you switch to the git SCM view, hit refresh, and see if that resolves it?

@lramos15
Copy link
Member Author

lramos15 commented Jun 7, 2024

That does not resolve it

@alexr00
Copy link
Member

alexr00 commented Jun 28, 2024

@lramos15 I found a place where I left out a model update from a bad merge last week. Do you still see this? If so, what is githubPullRequests.createDefaultBaseBranch set to and are you creating the PR from desktop?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Issue identified by VS Code Team member as probable bug candidate Issue identified as probable candidate for fixing in the next release verified Verification succeeded
Projects
None yet
2 participants