News for hackers. Stuff that matters.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by nequo on Tuesday May 02, 2023 @10:18AM (#35787812)
CVS used to be the standard before Git. Arguably CVS as the standard was not better than no standard if no standard let you use decentralized version control.

But Git is pretty good, so it will take something vastly better to replace it.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by lolinder on Tuesday May 02, 2023 @10:31AM (#35788039)
My understanding is that before git a substantial portion of the industry used the "one big shared drive and shouting across the room to lock files" version control system. There was also SVN that was pretty popular pre-git.

I don't believe any version control system achieved as deep industry penetration as git has.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by liveoneggs on Tuesday May 02, 2023 @10:43AM (#35788250)
subversion was just as dominant as git is now. Not using version control at all is probably just as common as it was previously.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by throwawayx50223 on Tuesday May 02, 2023 @10:56AM (#35788447)
That matches my experience too. SVN and CVS was very common as far as I remember. More developers probably use version control now than before, but version control was considered part of "best practice" before git was released.

There were of course places that were late to switch. I remember one of my old work places used P4 due to legacy in the CI/CD pipelines, but many teams kept a "shadow" git repository in Bitbucket with a bridge to P4. After a while, the company finally switched to Github Enterprise

Re:Let's Make Sure GitHub Doesn't Become the Only Option by morelisp on Tuesday May 02, 2023 @10:54AM (#35788419)
SVN took over the hobbyist area rapidly due to its workflow/UI similarity to CVS, but P4 held fast professionally until at least 2015, as well as Source Safe if you were an MS shop. (And conservative places never switched off CVS at all.)
Re:Let's Make Sure GitHub Doesn't Become the Only Option by andreabergia on Tuesday May 02, 2023 @10:45AM (#35788280)
In my experience, SVN was _everywhere_ 10 years ago or so.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by pcthrowaway on Tuesday May 02, 2023 @10:58AM (#35788482)
I used SVN once for my capstone project 11 years ago, graduated that same year, and literally haven't encountered it a single time in my career since then.

It definitely wasn't everywhere 10 years ago (but github was). Do you mean 15-20?

Regardless, having completed a CS degree during the period SVN was supposedly everywhere and only encountered it once because someone in my capstone team knew how to use it, I'm inclined to think it didn't permeate everything the way git does now.

If I could complete a bachelors in CS without encountering it in any of my courses, I think it's safe to say git is much more ingrained in the field now (pretty much every syllabus I come across online for CS courses from the last 5 years has had some github links)

Re:Let's Make Sure GitHub Doesn't Become the Only Option by Klonoar on Tuesday May 02, 2023 @01:41PM (#35791349)
SVNs heyday is closer to 15 years ago at this point.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by JohnFen on Tuesday May 02, 2023 @10:51AM (#35788363)
> a substantial portion of the industry used the "one big shared drive and shouting across the room to lock files"

Perhaps, but I've never seen that done. The version control system that is in fashion changes over time, but for my entire multidecade career there has always been one.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by sigstoat on Tuesday May 02, 2023 @11:59AM (#35789610)
If you take a look at Rapid Development (published 1996), one of the classic mistakes it lists is not using version control. A number of other 90s and earlier texts lament people not using version control.

Personally, a guy I dealt with circa 2010 stood up in a meeting on building better site-wide development processes, and asked what the point of version control was.

So, you've been lucky.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by JohnFen on Tuesday May 02, 2023 @12:04PM (#35789701)
Sure, I remember when that complaint was often cited. I'm just saying that using a version control system was the most common case even then. It wasn't as common as it should have been, though, that's true. But using version control was still common well before git came around.

Now, if you go back to the mid '80s and earlier, version control was rare.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by test1235 on Tuesday May 02, 2023 @11:00AM (#35788517)
>one big shared drive and shouting across the room to lock files

yes ... how did you know we used visual source safe?

Re:Let's Make Sure GitHub Doesn't Become the Only Option by HWR_14 on Tuesday May 02, 2023 @12:36PM (#35790219)
By the mid-90's VSS supported exclusively locking files and requiring files to be locked before working on them.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by dabraham1248 on Tuesday May 02, 2023 @02:26PM (#35792062)
Well, kinda? We did that. Then we discovered that about 10% of the time it didn't actually lock anything. So we included yelling across the room into our "grab it exclusively from VSS".

Yes, we had MS support, and they looked into it, and eventually basically shrugged (I'm told. I wasn't the one working with them).

Re:Let's Make Sure GitHub Doesn't Become the Only Option by stcroixx on Tuesday May 02, 2023 @03:14PM (#35792688)
I've been in the industry for 25 years and have never seen it done that way anywhere. First place I worked used PVCS then migrated to Clear Case. The first free one I used was CVS.

I'd say each predecessor had about the same level of penetration, which was 'nearly all'. CVS->SVN-GIT. Git will be replaced. It's ripe for that - its interface is terrible, storage is now cheap, and many companies have no actual need for decentralized version control and the complexity that comes with it.

Easiest to use of the bunch is still svn. You can teach a developer everything they need to know in 5 minutes and there's 3-5 commands total you'll need to use ever. I never once saw anyone get into some nightmare state they needed help to dig out of like I've seen routinely with git.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by gspencley on Tuesday May 02, 2023 @10:24AM (#35787916)
CVS, subversion and mercurial are all VCS tools that I remember using throughout the years. Didn't Microsoft even have its own for a while? I swear I remember Visual C++ integration features back in the 90s / early 00s but I can't remember what it was called.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by david422 on Tuesday May 02, 2023 @10:40AM (#35788203)
Clearcase version control was a fun one.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by Sander_Marechal on Tuesday May 02, 2023 @10:27AM (#35787970)
Yes, MS Visual Sourcesafe (VSS). It was... not very good
Re:Let's Make Sure GitHub Doesn't Become the Only Option by grimjack00 on Tuesday May 02, 2023 @10:36AM (#35788130)
It was, however, a step up from the shared network drive with a bunch of zip files.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by politician on Tuesday May 02, 2023 @10:47AM (#35788296)
Debatable. You would come into work in the morning and find that VSS had been corrupted and needed to be restored to an earlier backup. This was a common occurrence.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by prepend on Tuesday May 02, 2023 @11:12AM (#35788745)
That the lovely common occurrence of someone checking out 1000 files and going on vacation.

I preferred just a normal folder, rsync (or some nt utils equivalent) and backups.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by wheelie_boy on Tuesday May 02, 2023 @10:44AM (#35788267)
they also had an internal source control system that they never released, which was a fork of perforce that they had purchased the rights to use and modify. Not sure if that's still in use in any projects.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by AndrewStephens on Tuesday May 02, 2023 @11:02AM (#35788558)
Back in the late 90s we used to call it Visual SourceSieve - code changes would just leak away through the holes. Words cannot explain how much of a step up git (or even SVN) was.

As I recall, the main problem was that VSS didn't have a proper server! Instead the client modified files in the repository directly using Window's file sharing, relying on locks to maintain consistency. This would have been a bad idea even in Window's file shares weren't slow and buggy.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by fanf2 on Tuesday May 02, 2023 @01:53PM (#35791559)
I believe Visual Source Unsafe used the same storage layer as early versions of Exchange, which would break catastrophically when the underlying file grew past 2GB. Less than ideal.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by HappyJoy on Tuesday May 02, 2023 @10:27AM (#35787966)
Team Foundation Version Control

Edit: And Visual Source Safe

Re:Let's Make Sure GitHub Doesn't Become the Only Option by ilikehurdles on Tuesday May 02, 2023 @10:27AM (#35787978)
Microsoft Visual SourceSafe
Re:Let's Make Sure GitHub Doesn't Become the Only Option by jiggywiggy on Tuesday May 02, 2023 @10:23AM (#35787901)
Is it though? Don't know anyone who likes merging or rebasing. Especially big merges. I don't know a solution. But I'm sure someone comes up with a significantly less painful way at some point.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by prettyStandard on Tuesday May 02, 2023 @10:42AM (#35788233)
I love rebasing.

As for dealing with merge conflicts, it's called

  - keep up to date with the branch your tracking
  - merge frequently
  - get on a call when you do have merge conflicts
  - avoid having multiple people working in the same files simultaneously if possible
The problem with merge conflicts is you have two people changing the same lines of code at the same time. So I would imagine if you wanted to improve the situation you would need an AI powered version control system that understood the intent of the previous developers. But that's not going to fix bad habits.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by yjftsjthsd-h on Tuesday May 02, 2023 @12:30PM (#35790102)
> As for dealing with merge conflicts, it's called

That sounds like a lot of words for "try really hard to avoid having merge conflicts, because they suck to deal with"

Re:Let's Make Sure GitHub Doesn't Become the Only Option by jdmichal on Tuesday May 02, 2023 @10:41AM (#35788209)
I've used many different version control systems. Git is, by far, the best at merging and avoiding conflicts to start with. I believe it's because it can often work from the basis of a common ancestor commit, so it's able to perform three-way merges instead of two-way merges.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by HWR_14 on Tuesday May 02, 2023 @12:38PM (#35790254)
Wait, avoiding 3-way merges and instead only allowing 2-way merges has been on my list of "advantages of Mercurial that are sadly lost to git" list for a while. Can you expand on what you're saying?
Re:Let's Make Sure GitHub Doesn't Become the Only Option by jdmichal on Tuesday May 02, 2023 @02:48PM (#35792343)
Three-way merge might not be the correct term. I mean it as in the three versions being "original", "version-a", and "version-b". Original is the most recent common ancestor of version-a and version-b. So the system can generate clean diffs based on that original version during the merge.

I've seen other systems essentially say, "Oops both versions modified this file... Good luck!" It didn't matter that the modifications were to very different parts of the file. I've never seen that in Git. Any merge conflict I've gotten in Git has been a true potential conflict, even if the resolution is straight-forward from my perspective.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by HWR_14 on Tuesday May 02, 2023 @03:01PM (#35792515)
Ah, that's a standard merge but a 3-way diff. Many DVCSs have that (including Mercurial).

A 3 way merge would have "original", "version a", "version b", and "version c", where "original" is the common ancestor of a, b and c. Mercurial disallows merges like this, but git supports them. I have no idea why git allows it.

But yes, older VCSs ignored the "original" concept, which meant diff tools could just pop up "a" and "b". Which is just a way worse idea than including the original as well.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by throwawayadvsec on Tuesday May 02, 2023 @10:26AM (#35787960)
well merging two wildly different of files is going to be complicated using any tool, git is not the issue there, there isn't a million ways to handle this
Re:Let's Make Sure GitHub Doesn't Become the Only Option by dmoy on Tuesday May 02, 2023 @10:50AM (#35788352)
Right it's a use type thing.

If everyone develops from master branch and makes small incremental changes, no problem even if it's git.

If everyone develops from their own branches and goes off and does their own thing for a month, but those things are all in totally separate areas of the codebase, not as much of a problem either.

If everyone is developing in their own branches for a month, and they're working on overlapping things, and they aren't communicating? Then you get merge problems

But it's not really a merge problem, it's a communication problem. (And it's not git-only, you see merge problems even in perforce when people go dark for a long time and come back with a huge change that's got conflicts on 50% of the lines now)

Re:Let's Make Sure GitHub Doesn't Become the Only Option by nirimda on Tuesday May 02, 2023 @10:53AM (#35788398)
There's three ways. One is the git way, which is to let people do whatever and then ask them to handle it afterwards. The next best is used by some other annoying system I used early in my career, which is to require people to check out a file before they can get write permission on it, and only allow one person to have write permission at once, so that there's no real risk of merges. And the worst of all is to just let whoever comes later overwrite whatever was there before.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by jcranmer on Tuesday May 02, 2023 @10:48AM (#35788323)
Mercurial's phases and changeset evolution make specifically rebasing far less painful. git rebase -i is downright antediluvian in comparison.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by prepend on Tuesday May 02, 2023 @11:15AM (#35788809)
Merges are hard and I’ve never seen a system that removes the difficulty. I actually think git is the best because it’s easier to branch and update than many others (a pull takes a second to refresh vs quite a while for large repos with svn).

I was using ClearCase for a few years and they had a really nice visual merge tool, but the complexity of the merge was great because they were so infrequent. I made a mistake and let someone find out I could merge and ended up getting sucked into these quarterly multi-day merge sessions that made me feel like a guild navigator stressing about breaking one of thousands of changes from 50 people over 90 days.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by adastra22 on Tuesday May 02, 2023 @11:38AM (#35789240)
The solution is darcs’ patch-theory model of development, currently being pushed forward by pijul.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by gavinhoward on Tuesday May 02, 2023 @12:14PM (#35789855)
I am making a VCS to compete against Git and Pijul.

The patch-centric model of Darcs and Pijul is insufficient. You also need to remember where patches came from. If rewriting a patch does not keep its provenance, you're also in for a world of hurt.

But even that is not sufficient. You need to have more context than even the patch-centric model gives you.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by adastra22 on Tuesday May 02, 2023 @03:08PM (#35792594)
Please share when it is ready!
Re:Let's Make Sure GitHub Doesn't Become the Only Option by gavinhoward on Tuesday May 02, 2023 @03:21PM (#35792769)
Absolutely! I am planning to make a "Show HN" my official announcement, but only after it is self-hosting and has enough features to replace my Gitea instance.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by JohnFen on Tuesday May 02, 2023 @10:53AM (#35788399)
> But Git is pretty good, so it will take something vastly better to replace it.

Git is fine, but honestly, my favorite of the several I've used over the years is still svn.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by forrestthewoods on Tuesday May 02, 2023 @11:32AM (#35789127)
> But Git is pretty good, so it will take something vastly better to replace it.

Correction: Git is super mediocre, but sufficiently wide spread it will take something vastly better to replace it.

Don’t confuse inertia with goodness.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by MetaWhirledPeas on Tuesday May 02, 2023 @11:41AM (#35789304)
Git is solving a very complicated problem with a command line tool. Don't confuse a complicated problem with a mediocre application.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by forrestthewoods on Tuesday May 02, 2023 @01:05PM (#35790768)
Git is a mediocre CLI, imho, ymmv. GitHub I don’t have a strong opinion on.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by nequo on Tuesday May 02, 2023 @05:14PM (#35794305)
But Git is not only the porcelain, it’s also the plumbing. Do you think that the plumbing is super mediocre too?
Re:Let's Make Sure GitHub Doesn't Become the Only Option by forrestthewoods on Tuesday May 02, 2023 @10:48PM (#35797163)
I don’t know what that analogy is supposed to mean. I don’t think analogies are necessary or appropriate here.
Re:Let's Make Sure GitHub Doesn't Become the Only Option by nequo on Wednesday May 03, 2023 @07:47AM (#35801180)
This is the terminology that Git uses. Porcelain is the UI, whether it’s the basic CLI, Magit, Fugitive, or anything else. Plumbing is Git under the UI.

Are you saying that the CLI is bad, or that Git’s underlying concepts and data model are bad?

Re:Let's Make Sure GitHub Doesn't Become the Only Option by forrestthewoods on Wednesday May 03, 2023 @05:02PM (#35807761)
Git’s CLI API is definitely bad.

I think the plumbing is probably in-between poor and bad for most projects. It’s maybe great for Linux. However almost all projects are effectively centralized so the D in DVCS is a waste. (Offline/local support and fully distributed are different). I think source control should make it impossible for 99% of users to shoot themselves in the foot. And Git is still terrible at large binary assets, even with Git-LFS.

I use Git + GitHub for my personal projects. It’s mediocre but tolerable. Git is insufficient and not used for every professional project I have ever worked on. YMMV.

Re:Let's Make Sure GitHub Doesn't Become the Only Option by nequo on Thursday May 04, 2023 @08:58AM (#35814550)
Yeah, that makes sense. The CLI is definitely confusing. Every now and then you have draw on a book of spells to use it. I find it more comfortable with Magit but not sure if that makes up for all of the problems with the CLI.

What VCS would you use if it was all up to you?

Re:Let's Make Sure GitHub Doesn't Become the Only Option by forrestthewoods on Thursday May 04, 2023 @01:34PM (#35819172)
> What VCS would you use if it was all up to you?

Almost 100% of game devs use Perforce. Git is a non-option.

BigTech all use highly custom source control systems. They have some nice properties.

My stance isn’t that we should use something other than Git per se. It’s that Git is a local maxima, and it kinda sucks. And I think the industry would be healthier if people agreed Git sucks.

Features I care about:

* Terabyte scale sparse checkouts * Ten terabyte scale full checkout * Petabyte scale history * Lossless history. * Automatic cloud/remote backups of every commit * Trivial for low-tech people to use (Perforce achieves this) * Cross-branch file locking for non-mergeable assets

Things I don’t care about:

* Distributed. Defacto centralized with forking is all I need. * Rewriting history. Linux needs it, I don’t.

There are of course lots of things I do like about Git. It’d be good if Git and Perforce had some competition. There’s a market opportunity for it imho.