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.

Sign up for GitHub

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

Jump to bottom

cli: reorder updating and reporting for consistency. #4517

Merged
merged 1 commit into from
Sep 22, 2024
Merged

cli: reorder updating and reporting for consistency. #4517

merged 1 commit into from
Sep 22, 2024

Conversation

essiene
Copy link
Collaborator

@essiene essiene commented Sep 21, 2024 •
edited
Loading

Fixes: #4239

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@essiene essiene mentioned this pull request Sep 21, 2024
Closed
@essiene essiene marked this pull request as ready for review September 22, 2024 06:38
@essiene essiene requested a review from yuja September 22, 2024 06:38
yuja
yuja approved these changes Sep 22, 2024
View reviewed changes
cli/src/cli_util.rs Show resolved Hide resolved
@essiene essiene force-pushed the essiene/trqmymqskxvp branch 3 times, most recently from cb909ba to 1795fed Compare September 22, 2024 13:48
@essiene
cli: reorder updating and reporting for consistency.
77772ce 
* See #4239 for details.
* For now, update working copy before reporting repo changes, so that
  potential errors in reporting changes don't leave the repo in a stale
  state.

Fixes: #4239
@essiene essiene force-pushed the essiene/trqmymqskxvp branch from 1795fed to 77772ce Compare September 22, 2024 13:49
@essiene
Copy link
Collaborator Author

essiene commented Sep 22, 2024

Ugh, I forgot to update the CHANGELOG earlier. Done now.

Will submit as is. Do point out if something should be changed.

@essiene essiene enabled auto-merge (rebase) September 22, 2024 14:02
@essiene essiene merged commit 76f40e5 into main Sep 22, 2024
31 checks passed
@essiene essiene deleted the essiene/trqmymqskxvp branch September 22, 2024 14:02
@ilyagr
Copy link
Collaborator

ilyagr commented Sep 23, 2024

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuja yuja yuja approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Broken pipe when running jj rebase 2>&1 | head causes stale working copy
3 participants
@essiene @ilyagr @yuja