Register a SA Forums Account here!
JOINING THE SA FORUMS WILL REMOVE THIS BIG AD, THE ANNOYING UNDERLINED ADS, AND STUPID INTERSTITIAL ADS!!!

You can: log in, read the tech support FAQ, or request your lost password. This dumb message (and those ads) will appear on every screen until you register! Get rid of this crap by registering your own SA Forums Account and joining roughly 150,000 Goons, for the one-time price of $9.95! We charge money because it costs us money per month for bills, and since we don't believe in showing ads to our users, we try to make the money back through forum registrations.
 
  • Post
  • Reply
RPATDO_LAMD
Mar 22, 2013

🐘🪠🍆
Yeah, rebasing rewrites commit history instead of just appending to it, and any history-rewriting operation becomes a huge pain in the rear end if anyone else has a copy of the branch.

Adbot
ADBOT LOVES YOU

RPATDO_LAMD
Mar 22, 2013

🐘🪠🍆

smackfu posted:

Did CVS and SVN actually need a server like git, or could they just work with a shared network drive?

SVN does need a server, it doesn't store the diffs locally.
one of its worst features is that checking out a branch entails re-downloading all the files in the repository from the server, so if you try the typical git thing of making new feature branches constantly you will want to tear your hair out within a day.

The main benefit of central server based VCs like these is the ability to acquire an exclusive write lock on files, (some call this "checking out" the file but that's confusing) so if you're loving around with some impossible-to-merge binary file you can ensure that nobody else touches it and you won't see merge conflict hell.
For example in game dev Unreal Engine stores a lot of code in binary "blueprint" files. if the editor's version control integration is hooked up to an SVN or Perforce server, the editor will prompt you whenever you modify a blueprint / have uncommitted changes to lock it in the VC. Using git for this is extremely painful since you won't know that two people are touching the same file until you hit an inevitable conflict, and since the merge tools for blueprints are nonexistent one dev or the other is going to have to re-make all their changes.

RPATDO_LAMD fucked around with this message at 02:06 on Oct 12, 2023

  • 1
  • 2
  • 3
  • 4
  • 5
  • Post
  • Reply