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

next/prev: fix a few bugs in --conflict #3935

Merged
merged 5 commits into from
Jun 21, 2024
Merged

next/prev: fix a few bugs in --conflict #3935

merged 5 commits into from
Jun 21, 2024

Conversation

martinvonz
Copy link
Owner

@martinvonz martinvonz commented Jun 21, 2024 •
edited
Loading

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

@martinvonz
next/prev: include graph in --conflict tests, highlighting bugs
7f6e577 
There are several bugs in both the tests and in the implementation
that are made more clear by showing the log output before and after
running the command.
@martinvonz
next: add a test for jj next --edit on a head
ce9699a
yuja
yuja approved these changes Jun 21, 2024
View reviewed changes
cli/tests/test_next_prev_commands.rs Outdated Show resolved Hide resolved
cli/src/commands/next.rs Show resolved Hide resolved
PhilipMetzger
PhilipMetzger approved these changes Jun 21, 2024
View reviewed changes
Copy link
Collaborator

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG

cli/src/commands/next.rs Show resolved Hide resolved
cli/src/commands/next.rs Show resolved Hide resolved
@martinvonz martinvonz enabled auto-merge (rebase) June 21, 2024 19:37
@martinvonz martinvonz merged commit 3db183b into main Jun 21, 2024
28 of 29 checks passed
@martinvonz martinvonz deleted the push-xqtkknrlrnzt branch June 21, 2024 19:48
@martinvonz martinvonz mentioned this pull request Jun 23, 2024
Closed
essiene added a commit that referenced this pull request Aug 16, 2024
@essiene
Fetch descendants more correctly.
2cce150 
See: #3935 (comment)
essiene added a commit that referenced this pull request Aug 16, 2024
@essiene
Fetch descendants more correctly.
daee7e2 
See: #3935 (comment)
essiene added a commit that referenced this pull request Aug 16, 2024
@essiene
Fetch descendants more correctly.
8225760 
See: #3935 (comment)
essiene added a commit that referenced this pull request Aug 16, 2024
@essiene
Fetch descendants more correctly.
8b5fd32 
See: #3935 (comment)
essiene added a commit that referenced this pull request Aug 18, 2024
@essiene
Fetch descendants more correctly.
3215390 
See: #3935 (comment)
essiene added a commit that referenced this pull request Aug 23, 2024
@essiene
Fetch descendants more correctly.
acc6802 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 23, 2024
@essiene
Fetch descendants more correctly.
cdf6a22 
See context in [this discussion](#3935 (comment))

Fixes #3947
@essiene essiene mentioned this pull request Aug 23, 2024
Merged
4 tasks
essiene added a commit that referenced this pull request Aug 23, 2024
@essiene
Fetch descendants more correctly.
3edf228 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 24, 2024
@essiene
Fetch descendants more correctly.
d09e424 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 24, 2024
@essiene
Fetch descendants more correctly.
661c1e3 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 24, 2024
@essiene
Fetch descendants more correctly.
b019e86 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 25, 2024
@essiene
Fetch descendants more correctly.
e49f750 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 25, 2024
@essiene
Fetch descendants more correctly.
63d5615 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Aug 27, 2024
@essiene
Fetch descendants more correctly.
f695719 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Sep 12, 2024
@essiene
Fetch descendants more correctly.
f12ae43 
See context in [this discussion](#3935 (comment))

Fixes #3947
essiene added a commit that referenced this pull request Sep 15, 2024
@essiene
Fetch descendants more correctly.
6121166 
See context in [this discussion](#3935 (comment))

Fixes #3947