Live data from Hacker News

Jujutsu (jj), a Git compatible VCS

tonyfinn.com

31–40 of 117 posts

Re: Jujutsu (jj), a Git compatible VCS

#31

Earlier quoted context omitted.

Switch to branch for thing 1, work on it, commit, switch to branch for thing 2, work on it, commit, ...

Do you stash or create a commit with potentially partial work? What do you name that commit?

Personally I usually stash if it's partial work I'm going to return to soon. But you can create a commit if you want. Just name it 'WIP' or 'temp' or something. When you come back and finish it you can write the proper commit message.

Re: Jujutsu (jj), a Git compatible VCS

#32

Earlier quoted context omitted.

Switch to branch for thing 1, work on it, commit, switch to branch for thing 2, work on it, commit, ...

Do you stash or create a commit with potentially partial work? What do you name that commit?

Whatever I want because —amend is a thing?

Re: Jujutsu (jj), a Git compatible VCS

#33
post #11

Earlier quoted context omitted.

There are three answers to this. 1. If it works for you, no need to stop I remember plenty of people who used SVN saying why did they need to use git. In fact, I remember companies complaining about distributed version control generally, saying they preferred centralized version control. If it works for you, you can keep using it. No one will stop you, but you may find that just as SVN users have largely shrunk down,…

I get what you are saying about the nicer workflows for those cases. However, why would the contributors to jj not just try to make git better by addressing these weaknesses? I’m not being glib, just that it puzzzles me when a new oss comes out that does the same thing as another tool but a a bit different. I would have though that there is a way to have a git plug-in or even a way to contribute to git to enhance the…

If anything, lazygit has shown it is possible to have more natural workflows on top of git as demonstrated by https://www.youtube.com/watch?v=CPLdltN7wgE, so it is indeed possible

Re: Jujutsu (jj), a Git compatible VCS

#34
post #11

I'm still unsure of why I'd want to move to jj from git. My ideal git workflow is pretty simple: 1. `git switch -C new-branch` 2. Make changes, time passes 3. `git add .` 4. `git commit -m "Description of changes made"` 5. `git fetch && git rebase origin/main` 6. `git push` 7. Make pr to main If main is out of date I rebase again to update. This to me feels pretty light weight and is not a hinderence in any way on my…

There are three answers to this. 1. If it works for you, no need to stop I remember plenty of people who used SVN saying why did they need to use git. In fact, I remember companies complaining about distributed version control generally, saying they preferred centralized version control. If it works for you, you can keep using it. No one will stop you, but you may find that just as SVN users have largely shrunk down,…

Merges were so, so painful in SVN, though. Maybe SVN improved towards the end of its life? I remember everyone went well out of their way to avoid needing to merge until git, because it could take hours to resolve a heavily-conflicted tree.

Re: Jujutsu (jj), a Git compatible VCS

#35
post #3

Earlier quoted context omitted.

One advantage is that jujutsu tracks merge conflicts so you don't end up in a situation where you'll have to resolve the same conflict more than once, which may sometimes happen with git.

So it is git with rerere.enabled=1?

Well, I learned something new. I’m doing this first thing Monday morning.

Re: Jujutsu (jj), a Git compatible VCS

#36

Earlier quoted context omitted.

Switch to branch for thing 1, work on it, commit, switch to branch for thing 2, work on it, commit, ...

Do you stash or create a commit with potentially partial work? What do you name that commit?

`git add .`, `git commit -m "wip: some note about what I was doing"

Then checkout the new branch and do my work.

When I come back, `git reset --soft HEAD^`, and continue

Re: Jujutsu (jj), a Git compatible VCS

#37
post #25
post #13

Earlier quoted context omitted.

Moreover, even if it was say 15% better than git (and I doubt it is), the overhead of moving a whole industry across VCs is billions of dollars of loss. Every single engineer has to start over in their mastery experience by learning all the new quirks and issues, and all the tools, libraries, pipelines need to be rewritten. IMO better to support the dominant tooling than invest in fracturing one of the few areas wher…

The upside with jujutsu though is that it's completely compatible with Git and you can work on the same repository with Jujutsu while your coworkers use Git. This allows the people who want the 15% gain to have it, while not forcing anyone to do a costly migration.

I know people who really hate git because the UI is so awful, and it’s (theoretically) way more than a 15% gain for them. They’ll get to stop rubbing broken glass against their legs every day.

Re: Jujutsu (jj), a Git compatible VCS

#39

Earlier quoted context omitted.

Do you stash or create a commit with potentially partial work? What do you name that commit?

Whatever I want because —amend is a thing?

that's fine, what Im saying is that the above workflow is idealized and you have to do a lot more things overtime. If you look at the happy path it looks similar. With the unhappy path instead of keeping stashes and commiting trash then amending. You describe your change beforehand, and any change you do goes there. Thats it. Hotfix? jj new main go back to what you were working on? jj edit refA need to solve some problems in another pr of youre? jj edit refB.

Theres no overhead at all in thinking these, you can never lose work by mistake, you can never mess it up. It just works

Re: Jujutsu (jj), a Git compatible VCS

#40
post #11

Earlier quoted context omitted.

There are three answers to this. 1. If it works for you, no need to stop I remember plenty of people who used SVN saying why did they need to use git. In fact, I remember companies complaining about distributed version control generally, saying they preferred centralized version control. If it works for you, you can keep using it. No one will stop you, but you may find that just as SVN users have largely shrunk down,…

I get what you are saying about the nicer workflows for those cases. However, why would the contributors to jj not just try to make git better by addressing these weaknesses? I’m not being glib, just that it puzzzles me when a new oss comes out that does the same thing as another tool but a a bit different. I would have though that there is a way to have a git plug-in or even a way to contribute to git to enhance the…

Think of it this way: they are trying to make git better by addressing fundamental weaknesses in git, but some of those weaknesses require a fundamentally different UI paradigm and as such aren’t practical to upstream, hence a new project.
Post reply on HN