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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Non-watchman snapshotting in colocated repo incorrectly reports deleted submodules #5412

Open
mlcui-corp opened this issue Jan 21, 2025 · 1 comment

Comments

@mlcui-corp
Copy link
Contributor

This is https://chromium.googlesource.com/chromium/src/ checked out at f9fc4f9fc707.

Command log
$ jj debug watchman status
Watchman is disabled. Set `core.fsmonitor="watchman"` to enable.
Attempting to contact the `watchman` CLI regardless...
The watchman server seems to be installed and working correctly.
Background snapshotting is currently inactive.

$ jj st
Working copy changes:
D third_party/search_engines_data/resources
D third_party/webgl/src
D webkit/data/bmp_decoder
D webkit/data/ico_decoder
D webkit/data/test_shell/plugins
Working copy : kktl 1cab21c470d1 (no description set)
Parent commit: tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.

$ jj abandon
Abandoned commit kktl 1cab21c470d1 (no description set)
Working copy now at: qzoo 475882e285bb (empty) (no description set)
Parent commit      : tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.
Added 5 files, modified 0 files, removed 0 files
Warning: 5 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 475882e285bb`.
Discard the conflicting changes with `jj restore --from 475882e285bb`.

$ jj abandon
Abandoned commit qzoo bfa38bdae761 (no description set)
Working copy now at: ztyv 5413593ce6bd (empty) (no description set)
Parent commit      : tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.
Added 5 files, modified 0 files, removed 0 files
Warning: 5 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 5413593ce6bd`.
Discard the conflicting changes with `jj restore --from 5413593ce6bd`.

$ jj abandon
Abandoned commit ztyv 9a0bb16372fb (no description set)
Working copy now at: vtmr 758f533da402 (empty) (no description set)
Parent commit      : tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.
Added 5 files, modified 0 files, removed 0 files
Warning: 5 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 758f533da402`.
Discard the conflicting changes with `jj restore --from 758f533da402`.

$ jj abandon
Abandoned commit vtmr 6cc2b99eb278 (no description set)
Working copy now at: mxtv 770cfa0339d2 (empty) (no description set)
Parent commit      : tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.
Added 5 files, modified 0 files, removed 0 files
Warning: 5 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 770cfa0339d2`.
Discard the conflicting changes with `jj restore --from 770cfa0339d2`.

$ jj st
Working copy changes:
D third_party/search_engines_data/resources
D third_party/webgl/src
D webkit/data/bmp_decoder
D webkit/data/ico_decoder
D webkit/data/test_shell/plugins
Working copy : mxtv f1358c669f80 (no description set)
Parent commit: tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.

$ vim ~/.jjconfig.toml

$ jj debug watchman status
Watchman is enabled via `core.fsmonitor`.
Background snapshotting is enabled. Use `core.watchman.register_snapshot_trigger` to control it.
The watchman server seems to be installed and working correctly.
Background snapshotting is currently active.

$ jj abandon
Abandoned commit mxtv f1358c669f80 (no description set)
Working copy now at: vwpr 050c532ddaf5 (empty) (no description set)
Parent commit      : tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.
Added 5 files, modified 0 files, removed 0 files
Warning: 5 of those updates were skipped because there were conflicting changes in the working copy.
Hint: Inspect the changes compared to the intended target with `jj diff --from 050c532ddaf5`.
Discard the conflicting changes with `jj restore --from 050c532ddaf5`.

$ jj abandon
Abandoned commit vwpr 050c532ddaf5 (empty) (no description set)
Working copy now at: mmrl 17ef00fbed93 (empty) (no description set)
Parent commit      : tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.

$ jj st
The working copy is clean
Working copy : mmrl 17ef00fbed93 (empty) (no description set)
Parent commit: tlzv f9fc4f9fc707 main | Improve management of command-line passed shared memory handle.

I'm not too sure why there is different behaviour between watchman and non-watchman configurations. This could be related to #4349 and #5246.

Specifications

  • Platform: gLinux
  • Version: 9314df9
@yuja
Copy link
Contributor

yuja commented Jan 21, 2025

I'm not too sure why there is different behaviour between watchman and non-watchman configurations. This could be related to #4349 and #5246.

Yeah, it might be the same issue as #4349. For watchman issue, see #2613. If watchman is enabled, un-ignored files can be unnoticed (or newly-ignored patterns can be missed.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants