Programming

17661 readers

216 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Follow the programming.dev instance rules
Keep content related to programming in some way
If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities [email protected]

founded 2 years ago

MODERATORS

snowe

Ategon

[email protected]

Drew DeVault's blog — I'm daily driving Jujutsu, and maybe you should too (web.archive.org)

submitted 1 week ago* (last edited 4 days ago) by [email protected] to c/programming

8 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[–] robinm 5 points 1 week ago (1 children)

First experience with #jj #jujitsu

I tried the equivalent of git add -p (jj squash -i).

I realize that it’s closer to git add --interactive (which I find much more complicated and less productive)
I wasn’t able to edit a hunk (like the e key in git add -p) which I use a lot to split debug statements from real work

I generated a conflict (as I expected)

I found no way to show the original diff
jj undo did not worked (I have not been able to undo the jj squash that introduced the conflict

Very not impressed so far. Fortunately it was a test repo.

[–] [email protected] 2 points 1 week ago* (last edited 1 week ago)

I wasn’t able to edit a hunk (like the e key in git add -p) which I use a lot to split debug statements from real work

I don't think the builtin diff editor can do this, but you can set a different diff editor than the builtin one: https://github.com/martinvonz/jj/blob/main/docs/config.md#editing-diffs

edit: but wait, debug statements? Are they mixed in on the same line as the real code? The builtin diff editor can pick changes per line.

I found no way to show the original diff

jj evolog to show how a single change evolved including the previous commit that didn't have the conflict yet, if that's what you mean.

jj undo did not worked (I have not been able to undo the jj squash that introduced the conflict

If you did something afterwards, the operation you undo will no longer be the squash. Look at jj op log to see which one is the correct one to undo.