Please tell your friends about federated social media site that speaks several fediverse protocols thus serving as a hub uniting them, hubzilla.eskimo.com, also check out friendica.eskimo.com, federated
macroblogging social media site, mastodon.eskimo.com a federated microblogging site, and yacy.eskimo.com an uncensored federated search engine. All Free!
Another useful property is that while jujutsu does have worktrees, like git, in many cases where one would use git worktrees (for example when writing accompanying documentation ) it is just easier to use another line of changes (what is a branch in git).
Alas, that jujutsu does not store local change sets automatically on a remote git repo (this happens only when you update and push a git branch), means that still-mutable local changes are not automatically transferred to another computer you work on. And unpublished changes are naturally mutable in jujutsu. But you can safely copy a jj repo via rsync, as changes in jj metadata are thread-safe and atomic. The other way is of course to push a work-in-progress ("WIP") git branch which can mutate and is therefore not allowed to be merged by other people.
That’s not really how one would use worktrees in git. Worktrees are useful in the case when e.g. you are working on version 0.15 of your software that has many breaking changes to version 0.14 (perhaps even on a build system level) and you need to release a 0.14.1 patch. Worktrees separate directories which means you don’t need to stash or do a wip commit, nor clear you 0.15 build artefacts. Just cd to a different worktree, checkout the 0.14 branch, create and checkout the 0.14.1 branch, clear build artifacts in a different directory from your main development one, and start working.
When done, just cd back and keep working again without switching branches, clearing artifacts, or doing full rebuilds of the in-development 0.15 version.
Plus, git does not store change sets or branches or anything on any remote unless you push them either, so if you’re having that problem just stop pushing things you don’t want to push. You can totally rsync a git repo, just ensure it’s at rest. Otherwise do what you should be doing anyway: set the repo on another machine as a remote of the other repo, so you can git pull my_private_machine feature/my_private_branch without needing to push to a central repo.
I’m sure jujutsu has many advantages, but it also reads to me like you’re misunderstanding the git model. Which can be a fair critique of git to be fair, but then we would need to talk about what about the git model people have trouble with, why, and how to address those issues, and so far I haven’t seen any kind of research in that direction from jujutsu (not that I’ve been looking particularly hard)
One difference between using worktrees and branches in git is that in git you usually have uncommited stuff that's not finished, and worktrees are a way to avoid committing this. And you want to avoid committing early because it is hard to clean-up later. This hesistsnce to commit is not necessary at all in jujutsu - any change to the source files is already captured and will be restored once you go back to that changeset. There are other cases where you use worktrees in git e.g. to isolate a build and an hour-long integration test running it in parallel to your ongoing work, and in thar cases, you'd use workspaces in jujutsu like you'd in git.
but then we would need to talk about what about the git model people have trouble with, why
Too many commands that do subtly and irreversivly things on the repo, with potentially messed-up interim states, only to do the conceptually much simpler task to edit and manipulate the directed acyclic graph of commits.
In short, jujutsu is a commit graph editor and does the same with perhaps 10% of the complexity of git. The man pages on the git reset, branch and merge commands are already larger than the whole - and detailed!- documentation of jujutsu.
Steve Klabnik explains this much better than I can here in his blog that I posted.
It is simply not my experience that cleaning up commits after committing early is difficult in git. Amending a commit is a single -a flag away from the git commit command. The opposite problem is when you do too much work and want to split it into multiple commit rather than a huge one, in which case git add -p is again a single flag away from git add.
In general, git’s entire model is to allow you to work first, and do administrative tasks (including tidying up your commit history etc) later.
And almost nothing is truly destructive in git, the vast majority of cases can be fixed by judicious use of git reflog.
The only cases I’ve ran into where git repos became corrupted were caused by external tools, mainly GUIs that label buttons with git commands that do something different when clicked (like the button labeled push actually doing git push —all for no good reason, and such things) with users that have no idea how git works that have been trained just by telling them “click this to save your work, click this to get the last version of the code”
I have to admit that in spite of having used git for about 20 years, I never used reflog. And even with magit I did stuff like rebase rarely. I found it costing too much time to read the man pages again every time and meditate what would happen with "reset xyz".
Fair, git’s documentation can definitely be too terse despite being very extensive and could really benefit from examples and common use cases sections. I only use a fraction of what git offers, but what I do use I use often, which definitely contributes to my happiness with git: I seldomly need to look things up
Technically true - but it looks like jj does a lot of history re-writing which would require a lot of care to be taken when working on a shared codebase.
We need the --allow-backwards flag to set the trunk branch to the previous commit because it is a dangerous operation: if we had pushed trunk, things would get weird when we try and push now. We've kept it all local, so there's no issues with doing this.
Hrm... It looks interesting but it seems too dedicated to crafting "the perfect commit".
Changing our description changed the commit ID! This is why we have both IDs: the change ID has not changed, but the commit ID has. This allows us to evolve our commit over time, but still have a stable way to refer to all versions of it.
I don't want to "evolve a commit" - I want to capture my changes over time. If I decide later that I want to prepare the commit for merging I will.
I hate it because it's different - but even trying to give it a "benefit of the doubt" I really can't see this as better. It's not like it's difficult to create a "tidy" commit with git as is.
And as far as "easier to use goes"... well... Here's how you get a list of anonymous branches
jj log -r 'heads(all())'
And since they eschew branches with names you get to memorize hash strings instead of branch names that describe the thing you were doing?
jj new pzoqtwuv yykpmnuq -m "merge better documentation"
# vs.
git merge my_branch_Name
I'm unconvinced. Though jj undo looks neat (and also crazy dangerous unless you can undo an undo?).
And since they eschew branches with names you get to memorize hash strings instead of branch names that describe the thing you were doing?
No trouble, you can still name branches if you want. And no, you don't have to type the whole changeset hash, the first one to three letters are usually sufficient.
Also, branch names are not a permanent thing, they disappear after you merged them.
If you want, to can put an empty commit with the description of what you want to do at the top of your changes, and then use "jj split" to move changes to different commits before it. There are several common work flows which are explained in Klabnik's blog post.
Yeah you can undo undo and also resurrect undone states.
If the readability of the commit history really does not matter to you - for exsmple, nobody needs to read this code again - it's possible that jj does not give you enough advantage. Everyone works different.
If the readability of the commit history really does not matter to you - for exsmple, nobody needs to read this code again - it’s possible that jj does not give you enough advantage. Everyone works different.
I mean... It does and I will use git to manage commit histories as necessary. I don't see jj as solving that problem or even making it easier. Doing a single squash-commit or a rebase -i when I merge a branch is relatively trivial.
And from what I can tell it's much easier to do a git pull upstream master than to do jj new skdfsld dskfjas since you'll likely have to lookup those hashes? I mean I wouldn't remember them.
And from what I can tell it's much easier to do a git pull upstream master than to do jj new skdfsld dskfjas since you'll likely have to lookup those hashes? I mean I wouldn't remember them.
One takes them from the last commit log and uses the first few letters. Steve Klabnik shows how they are used in practice. It makes no sense to repeat it here.
One takes them from the last commit log and uses the first few letters
So - it's not the length of the random garbage that is the issue it's the fact that it's random garbage that I have no chance of remembering after 5 seconds and switching between branches. All my branches are instead random hashes that I'll need to lookup or remember.
I've read through the blog. It sounds like they've taken the minor inconvenience of doing a git merge --squash and distributed that pain across every-single-commit you're ever going to make instead. All to get "tidy commits" which were possible before anyway.
I was actually rather interested in the idea of jj being something that made history-rewriting easier (e.g. for removing bad commits with passwords and the like). But the fact that it almost completely throws out the entire concept of working on named branches (yes you can have them - but "One interesting thing about branches in jj that's different than branches in git is that branches do not automatically move." - genius) is just ridiculous. And to claim that it's now simpler just seems like gaslighting.
#Flaming Ember #55 years Give my mind to you with a love that'll never grow old You are my smiles the last tears You are my days, my weeks, my years You are the flowers beneath my window sill You are everything beautiful everything that's real I give my love to you all my body and soul youtu.be/5M91JHi3gZc?si=rjpNOL…
@24tv48 From the Upbeat TV Show.The Flaming Ember was an American blue-eyed soul band from Detroit, Michigan, who scored hits with "Mind, Body and Soul" in 1...
I'm looking for a music player on Pop!_OS that supports playlists, repeating a single track while still being able to swap tracks in the playlist, and also supports fading between songs and when stopping playback. And ideas on what to try?
So far I've tried VLC, Audacious, and Rhythmbox, but none of those seem to support all of those requirements. (Rhythmbox was close but the repeat one from the toolbar plugin doesn't work.)
Edit: Got it working in Rhythmbox after toggling the repeat options a few more times. Still curious if there are other options out there though.
The Nullobsi fork of Cantata or many other mpd-backed music players are something I can recommend seems to fit what you're looking for. It supports being able to edit the play queue whilst running a single-track on repeat within it. It does also support fade out and crossfade. The easiest way to obtain it is via its flatpak on Flathub. Cantata can either run an integrated or connect to a system-level mpd server for its backend.
Johan Messely20/02/1953 Johan Messely crée des peintures à l’huile débordant de couleurs, des tableaux provençaux qui attirent le spectateur et l’invitent à y entrer, s’y installer dans le calme pour y profiter du soleil, de l’ombre et surtout de la …
and hundreds (or thousands) of sex traffickers will still be running the top tiers of government, business, and entertainment, protected by other pedophiles in government.
The original "Bridge to Nowhere" in New Mexico is an iconic destination that you may recognize from famous film sets, near an artsy town you should visit.
I'm pro-union and pro-international workers associations for better conditions or anticapitalist antifascist activism, this government deliberately trying to gaslight workers at fault for something caused by bosses/ceos/governments internationally, riots are a language of the unheard and downtrodden.
My aunt is currently in the middle of a major sundown" episode due to a relief caregiver not giving her her meds at the right time.
I am home in Fort Worth and am in contact with the caregiver and a really good neighbor who are with her. There is nothing we can really do until she settles down (law will not allow anyone to force medication on her).
If you have the time, please pray for the caregiver and the neighbor friend as they deal with this.
Unfortunately, she is under home hospice care and it will be tomorrow before a doctor can visit to evaluate her.
So we ride it out until then. She will most likely run out of energy and fall asleep and in the morning have no recollection of the event and will take her meds as prescribed.
Been through this before, but this is the worst episode to date.
She is off the charts and we are working to have her transported to a facility to stabilize her. Unfortunately I am doing this remotely and working multiple parties by phone.
"I think Trump's name is on the list. I think Mossad knows it. I think Mossad told their American stenographer, who happens to be the director of the CIA, who takes down and regurgitates everything Mossad told him… And I think that stenographer whispered it into the president's ear," Judge Andrew Napolitano claims.
🔥According to him, the White House is terrified this will come out, because "it will be the beginning of the end," no matter who controls Congress.
i'm poor and i come from a long line of poors. i can't relate to your complaints that your parents or grandparents were rich and now you can't live the same lifestyle you're accustomed to. i guess i'm sorry you were a rich kid and now you're afraid to be poor like me. it's not that bad.
Idk She works there and leaves a box of cans, beans, and rice every few weeks, along with rotting meat and fruit. I have a huge pile of boxes of spoiled canned food that I'm too busy to haul out t...
Yeah, the food is put in the can, the can is sealed, and then its heated to both cook the food in the can and to kill off any bacteria. As long as the can doesn't lose its air-tight seal, they can last a long time.
A few months ago, I opened a 10-year-old can of corn and another of sweet peas, just to prove it to my GF. They were just fine.
Just be careful with pop-top lids cause they can lose their seal easily. And be careful with stuff like fruit cocktail cause the acid in citrus juice can corrode the aluminum can after a while.
i got thru 6/8 of the yakuza movie series i've been watching. fun stuff and makes me want kakubin whiskey, which the japs won't export since they consider it bottom shelf swill. i'll have to fill a bag with it from the duty free next time i stop on the eleventh district
no the yakuza are interesting and i've enjoyed reading their autobiographies but those make it clear that much like every other industrialized country their crime families were aa bunch of violent retarded niggers even if they dressed it up in honor based traditionalist jap colors even the dudes in kabukicho in the suits around their bars are larpers these days, the old men who are still "legitimate" yakuza are frozen out from finances and infrastructure while the money fled to north korea and SE asia
the traditional family based yakuza got crowded out at the end of the 20th century. the Yamaguchi-gumi still exist but they were always less tradition based than the other families and are more globally integrated if that makes sense. yakuza membership is way waay down due to both much more stringent law enforcement and the general prosperity of japanese society allowing people to reject the traditional, non-official lifestyles. organized crime still exists there of course but its not nearly what it was decades ago
organized crime still very much exists in the us. possibly at a high point. everyone thinks of a bunch of guineas in the us during the cosa nostra glory days as the peak here, but they were generally kind of small time. their more legit ventures got eaten up by corps and their less legit ventures like prostitution and drug trafficking got outsourced to mexican and american gangs which while they might operate on ethnic lines at a local level very much do not give a shit at a larger level. look at the mexican mafia linking up with white skinhead prison gangs to move meth, it's all about the money. and since we're on fedi we can talk about jewish influence but at the end of the day these criminals are niggers
@Paultron-3030 it’s interesting you say prosperity caused the downfall of the yakuza, because by most metrics Japan has been stagnant since the 90’s. It makes me wonder if the real cause is something else, like maybe the internationalization or globalization of organized crime, like you point out in your second paragraph.
it's stagnant, but people can live. even the poor in japan can rely on a generally highly professional and non corrupt police force to not entirely screw em over, which is huger. in the 60's and 70's this was not the case. the GHQ cast a long shadow through jap society even after the student riots and reorganization of the japanese civilian gov but back in the day poorer people living on the fringes in maybe not exactly legitimate roles could not rely on the police for anything, so the yakuza moved into that vacuum. small loans, keeping the streets free of petty crime (that wasn't yakuza sanctioned), and disaster relief bought them a role such that the government turned a blind eye. the jap government is strong enough that they don't need to do that and people can choose to ignore the violent nigger criminal man i don't think the yakuza, or the mafia, or triads or even the cartels exist along the strictly racial lines anymore. everyone's there for money. who cares if the murderer you've thrown your lot in with is pale or dark anyways if you have a real long haul flight or hours to kill the original yakuza papers or "battles without honor or huimanity" are great. 5 films, all very well directed, based off irl yakuza niggatry. there's also a good book i read that lays out the latter days of the old yakuza from the eyes of a foot soldier to officer guy, called the Last Yakuza. it's ghost written by a jew but there is only one aside about the holocaust in there
absolutely. its easy to romanticize the 5% of gang actions that weren't openly anti-social but they are at the end of the day criminal organizations like i hate the US government and their secret police the FBI, but you'll never catch me talking bad at their total eradication of the italian mafia from the late 60s to the late 80s. probably the best thing they've ever done
@Paultron-3030 I disagree personally, if it just created a bigger, higher form of mob. A more corporatized, international, globalized, totalitarian mob. Although I’d probably agree with you if I came face to face with them.
at the end of the day criminal mob and government can be reduced to the exact same principles of social organization, since both are based around centralizing the power of violence to enforce a codified social order but governments at least can be organized to prioritize goals higher than individual wealth and power of various members, given a minimum of human capital. japan and parts of the west in better days prove this but the way things are going this may just be reminiscing about the good ol days and how things may have gone if they were different
@Paultron-3030 I get the sinking feeling, with all the black and grey activity that goes on in the US, that the FBI was basically in a turf war on behalf of the Jewish mob. The ethnic mobs were at least local. They were *your* criminal organizations. It entailed a certain power being held by the ethnic groups. Now they’re gone, and there’s a huge underground economy in the US, and it’s not just agriculture. Makes me wonder if we weren’t better off with the ethnic mobs, but maybe I’m merely associating the good ole days with them.
as to what the FBI was doin i don't know. getting rid of the big international gangs (that the US WW2 government had a strong hand in establishing) was a good thing regardless of motive. it was not the end of the road into fixing the US but obviously that was not their motive they were never your criminal org, if you weren't in them. the first and most important factor of such a group is that they dig a gulf between themselves and normal people- a sense of unique identity is a bonding factor for members and a weapon to be wielded over 'civilians'. ultimately non members were objects to be abused for money. the route to the most money did not always involve harming these civilians, but they weren't holding back out of the kindness of their hearts it ultimately boils down to how you view power relationships- any relation between people will have a power aspect, but do you think there is a role of concentrated power from groups of people to utilize that power for greater ends without making it miserable for everyone its happened a few times before but idk if it can be legislated into consistency and time is short for this planet
@relentless_eduardo you can just cut it in the kitchen and then take the cut pizza in your room why take the cutter in your room? and then why not bring it back out?
If you can find one from any of these places and it's a shippable size, I could go and pick it up and ship it to you. You can definitely find it here. They run a plant sale once a year to the publ...
Truly heartbreaking: A man called into Alex Jones' Infowars on June 16 to say: "I married an illegal and I want to know if there's any proactive step we can take to maybe get on a list of 'leave this one alone' or whatever. We've been in the system. We've got two lawyers, we've spent thousands of dollars..." at which point Alex Jones cuts him off and says basically if the country doesn't remove immigrants than the democrats will win so they need to "hurt some people who aren't bad."
These people are so stupid they don't realize that illegal immigrants not only can't vote, but they don't even try to vote. They've convinced themselves of a problem that doesn't exist.
Israeli airstrikes and artillery bombardment killed at least 92 people across the #Gaza Strip on Sunday, with at least 42 killed in Gaza City alone, Arab sources say.
Edward Tomasz, a FreeBSD contributor for over 18 years, advocates for the "hunting" of Jews and used the FreeBSD Wiki to spread hate. The FreeBSD Core Team h...
I can't remember the exact details, but the Plymouth Fury from these years was an option on top of the Belvedere, and they all came in a specific paint scheme that was NOT red with white trim. (one year it was gold with aluminum trim, and another year it was buckskin white with gold trim) The Fury in "Christine" was shown as a special order (which I don't think Plymouth would actually do) but it definitely made it stand out in the beginning scene where she is the only red car on the line of light colored Furies.
Stephen King wrote Christine as a 1957 Fury because he wanted to use a car that wasn't "popular" like the 1957 Chevy Bel Air. But he did almost zero research and originally wrote Christine as a 1957 Fury 4-door, which did NOT exist.
In the year 1957, Chrysler rocked the automotive industry by revamping it's entire line (and every badge Plymouth, Dodge, Imperial) with all new revolutionary styling. These forward stance lines and fins were adopted by all other manufacturers on their next 5 year design cycle refresh.
TONIGHT'S STREAM: swtor, rachel the sith inky we killed the annoying cyborg man and didn't even have to fistfight a ghost yet live at 11:30 ET/10:30 CT @ twitch.tv/skylarkaede
In the year 1957, Chrysler rocked the automotive industry by revamping it's entire line (and every badge Plymouth, Dodge, Imperial) with all new revolutionary styling. These forward stance lines and fins were adopted by all other manufacturers on their next 5 year design cycle refresh.
These had a fantastic drag coefficient. There used to be a pre-1960 racing league where the rules were you had to use a pre-1960 body but could use whatever chassis/powertrain combo you wanted underneath it. Everyone kind of expected it to be a Corvette show but the Studes dominated because of their aerodynamics.
Studebaker was also, as far as I can tell, the only company of significant size to successfully transition from horse-drawn buggy manufacturer to automobile manufacturer. Studebaker built many of the Conestoga wagons that were used to settle the West.
The Good Guys are building concentration camps in Rafah and massacring civilians trying to obtain food.
The Good Guys are circling the planet with hundreds of military bases and telling us we're not allowed to oppose genocide.
Yesterday I saw a little girl playing and I thought how nice it is that she has all her limbs and that she is not lying still covered in gray dust while her father screams and cries and calls out to God while trying to kiss her back to life.
The world is changed now. The moon is covered with powdered buildings. The pigeons are weeping and the wind sounds like drones. Sometimes I cough and gray dust comes out. Sometimes it's a child's shoe. There's a dead donkey lying in my backyard that nobody wants to talk about.
The Australians chat about real estate investments and how you can knock down one house and replace it with two houses and then make believe that neither house smells like corpses.
The news man tells us the corporations are just dumping the products directly into the Pacific now while clinging tightly to the edge of the screen so the black hole doesn't pull him in.
Everything's fine, the news man yells, and the system is working perfectly. We are the Good Guys after all. We are, after all, the Good Guys. caitlinjohnst.one/p/the-good-g…
Bardic is a private Mastodon instance hosting a carefully selected group of adventurers and adventurers to be. We're friendly, salty, spicy, inappropriate and above all, on the fedi to have fun.
@BleachChan these guys wouldn't so much as breathe near us if we encountered them in real life but since we're online they feel empowered to do "le fediblock for crimes!!!!!!!"
Let me put it to you: How many active Commodore 64 users, "real" hardware and modern equivalents, do you think there are in the world? 5,000? 10,000? Retrocomputing is a small world.
It’s small right now but I’d love open hardware, gateware, and software for kids to learn upon. That’s what’s appealing about your project to me. (That, and I’d finally feel like remembering the 6502 instruction set isn’t wasted brain space.)
I’m not sure the revived C64 is fully open though? And the fact the guy is a Truther is an instant turn off. Regardless, enjoy researching the competition.
It seems that owning an official, secondhand S1 cart can also create problems if a previous owner ripped it and has been running it elsewhere via a flashcard.
paequ2
in reply to HaraldvonBlauzahn • • •Ooooh, that's interesting.
HaraldvonBlauzahn
in reply to paequ2 • • •Another useful property is that while jujutsu does have worktrees, like git, in many cases where one would use git worktrees (for example when writing accompanying documentation ) it is just easier to use another line of changes (what is a branch in git).
Alas, that jujutsu does not store local change sets automatically on a remote git repo (this happens only when you update and push a git branch), means that still-mutable local changes are not automatically transferred to another computer you work on. And unpublished changes are naturally mutable in jujutsu. But you can safely copy a jj repo via rsync, as changes in jj metadata are thread-safe and atomic. The other way is of course to push a work-in-progress ("WIP") git branch which can mutate and is therefore not allowed to be merged by other people.
ugo
in reply to HaraldvonBlauzahn • • •That’s not really how one would use worktrees in git. Worktrees are useful in the case when e.g. you are working on version 0.15 of your software that has many breaking changes to version 0.14 (perhaps even on a build system level) and you need to release a 0.14.1 patch. Worktrees separate directories which means you don’t need to stash or do a wip commit, nor clear you 0.15 build artefacts. Just cd to a different worktree, checkout the 0.14 branch, create and checkout the 0.14.1 branch, clear build artifacts in a different directory from your main development one, and start working.
When done, just cd back and keep working again without switching branches, clearing artifacts, or doing full rebuilds of the in-development 0.15 version.
Plus, git does not store change sets or branches or anything on any remote unless you push them either, so if you’re having that problem just stop pushing things you don’t want to push. You can totally rsync a git repo, just ensure it’s at rest. Otherwise do what you should be doing anyway: set the repo on another machine as a remote of the other repo, so you can
git pull my_private_machine feature/my_private_branchwithout needing to push to a central repo.I’m sure jujutsu has many advantages, but it also reads to me like you’re misunderstanding the git model. Which can be a fair critique of git to be fair, but then we would need to talk about what about the git model people have trouble with, why, and how to address those issues, and so far I haven’t seen any kind of research in that direction from jujutsu (not that I’ve been looking particularly hard)
HaraldvonBlauzahn
in reply to ugo • • •One difference between using worktrees and branches in git is that in git you usually have uncommited stuff that's not finished, and worktrees are a way to avoid committing this. And you want to avoid committing early because it is hard to clean-up later. This hesistsnce to commit is not necessary at all in jujutsu - any change to the source files is already captured and will be restored once you go back to that changeset. There are other cases where you use worktrees in git e.g. to isolate a build and an hour-long integration test running it in parallel to your ongoing work, and in thar cases, you'd use workspaces in jujutsu like you'd in git.
Too many commands that do subtly and irreversivly things on the repo, with potentially messed-up interim states, only to do the conceptually much simpler task to edit and manipulate the directed acyclic graph of commits.
In short, jujutsu is a commit graph editor and does the same with perhaps 10% of the complexity of git. The man pages on the git reset, branch and merge commands are already larger than the whole - and detailed!- documentation of jujutsu.
Steve Klabnik explains this much better than I can here in his blog that I posted.
ugo
in reply to HaraldvonBlauzahn • • •It is simply not my experience that cleaning up commits after committing early is difficult in git. Amending a commit is a single
-aflag away from thegit commitcommand. The opposite problem is when you do too much work and want to split it into multiple commit rather than a huge one, in which casegit add -pis again a single flag away fromgit add.In general, git’s entire model is to allow you to work first, and do administrative tasks (including tidying up your commit history etc) later.
And almost nothing is truly destructive in git, the vast majority of cases can be fixed by judicious use of
git reflog.The only cases I’ve ran into where git repos became corrupted were caused by external tools, mainly GUIs that label buttons with git commands that do something different when clicked (like the button labeled
pushactually doinggit push —allfor no good reason, and such things) with users that have no idea how git works that have been trained just by telling them “click this to save your work, click this to get the last version of the code”Sickday likes this.
HaraldvonBlauzahn
in reply to ugo • • •ugo
in reply to HaraldvonBlauzahn • • •HaraldvonBlauzahn
in reply to ugo • • •atzanteol
in reply to paequ2 • • •Technically true - but it looks like
jjdoes a lot of history re-writing which would require a lot of care to be taken when working on a shared codebase.The page on remotes has some cautions in it.
Working with remotes, e.g., GitHub - Steve's Jujutsu Tutorial
steveklabnik.github.ioHaraldvonBlauzahn
in reply to atzanteol • • •jjby default refuses to change any commits on published branches such as a master branch that has been pushed. The details are configurable.BTW that's why I linked Linus Torvalds mail on when and why to rewrite history - it is good advice.
atzanteol
in reply to HaraldvonBlauzahn • • •Hrm... It looks interesting but it seems too dedicated to crafting "the perfect commit".
I don't want to "evolve a commit" - I want to capture my changes over time. If I decide later that I want to prepare the commit for merging I will.
I hate it because it's different - but even trying to give it a "benefit of the doubt" I really can't see this as better. It's not like it's difficult to create a "tidy" commit with git as is.
And as far as "easier to use goes"... well... Here's how you get a list of anonymous branches
And since they eschew branches with names you get to memorize hash strings instead of branch names that describe the thing you were doing?
I'm unconvinced. Though
jj undolooks neat (and also crazy dangerous unless you can undo an undo?).HaraldvonBlauzahn
in reply to atzanteol • • •No trouble, you can still name branches if you want. And no, you don't have to type the whole changeset hash, the first one to three letters are usually sufficient.
Also, branch names are not a permanent thing, they disappear after you merged them.
If you want, to can put an empty commit with the description of what you want to do at the top of your changes, and then use "jj split" to move changes to different commits before it.
There are several common work flows which are explained in Klabnik's blog post.
HaraldvonBlauzahn
in reply to atzanteol • • •Yeah you can undo undo and also resurrect undone states.
If the readability of the commit history really does not matter to you - for exsmple, nobody needs to read this code again - it's possible that jj does not give you enough advantage. Everyone works different.
atzanteol
in reply to HaraldvonBlauzahn • • •I mean... It does and I will use git to manage commit histories as necessary. I don't see
jjas solving that problem or even making it easier. Doing a single squash-commit or arebase -iwhen I merge a branch is relatively trivial.And from what I can tell it's much easier to do a
git pull upstream masterthan to dojj new skdfsld dskfjassince you'll likely have to lookup those hashes? I mean I wouldn't remember them.HaraldvonBlauzahn
in reply to atzanteol • • •atzanteol
in reply to HaraldvonBlauzahn • • •HaraldvonBlauzahn
in reply to atzanteol • • •One takes them from the last commit log and uses the first few letters. Steve Klabnik shows how they are used in practice. It makes no sense to repeat it here.
atzanteol
in reply to HaraldvonBlauzahn • • •So - it's not the length of the random garbage that is the issue it's the fact that it's random garbage that I have no chance of remembering after 5 seconds and switching between branches. All my branches are instead random hashes that I'll need to lookup or remember.
I've read through the blog. It sounds like they've taken the minor inconvenience of doing a
git merge --squashand distributed that pain across every-single-commit you're ever going to make instead. All to get "tidy commits" which were possible before anyway.I was actually rather interested in the idea of jj being something that made history-rewriting easier (e.g. for removing bad commits with passwords and the like). But the fact that it almost completely throws out the entire concept of working on named branches (yes you can have them - but "One interesting thing about branches in jj that's different than branches in git is that branches do not automatically move." - genius) is just ridiculous. And to claim that it's now simpler just seems like gaslighting.