Skip to main content

Version Control Systems (Part I):
Local Version Control Systems

(9 minute read)

When you hear “version control” or “version control systems”, you might immediately think of git. You may be already using Git and GitHub since they are now de facto industry standards. But do you know other version control systems exists too, how about the history of version control systems?

Alternatively, you may have almost no idea what version control is. You might have come across words like Version Control, Source Control, Git, GitHub, SVN, and all the other terms. You might have wondered what they all meant.

Throughout this multi-part post you will learn what version control is, version control systems, popular platforms built on the top of the version control systems and much more.

Then, let’s get started!

In part one of this multi-part version control series post, we will learn below concepts:

Table of contents:

What is Version control

Version Control (also known as Revision Control/Source Control) is a practice of managing different versions of digital files in an organized and efficient manner.

You can think of version control as “Efficient management of archives”.

With version control, you can easily switch back and forth between different versions. In version controlled environment, if you’ve made a mistake and want to revert back to the state/version of your files let’s say two weeks ago, you can do so easily.

Note: In software development, the term “Version control” is used interchangeably with other terms such as “Source code control”, and “Source code management”.

Now we know what version control means, it is time to learn about version control systems.

Version control Systems

A version control system is a software that implements version control concept i.e efficient management of archives.
Every version control system has to have two core functionalities:

  1. viewing old versions
  2. reverting a file to its previous version.

Applications like Microsoft Word, web applications like Notion, and platforms like Snowflake etc. have builtin and automatically managed version control systems. What it means is that you do not have to instruct these applications to save a specific version of your files (as archive). These applications automatically take snapshots of your files and save them as versions.

However, not every application includes automatic version controlling. Besides, in software development we want to be in control of how, when and which files are saved in the version control. So, we will learn this manual version of version control systems.

All version control systems (software) save the changes specific to a particular version with most or all of the following metadata:

  • version id
  • who made the changes
  • what changes were made
  • the timestamp that the version is being saved at
  • and more.

Note: It should be emphasized that we as a user instruct the version control system to save the changes (i.e. current version of the files). After that, a version control system saves the current version of the files along with the metadata.

Types of Version Control Systems

There are three types of version control systems:

  • Local version control systems (LVCS)
  • Centralized version control systems (CVCS)
  • Distributed version control systems (DVCS)

Before continuing the discussion of version control systems further, let’s learn some essential terminologies.

Note: There are many version control systems, and each of them has its own interpretation of below terminologies. To make this post practical, I will use explanation geared towards most commonly used version control system, git. (Nuances will be explained later.)

Change:

A modification to a file/files.

Initialize:

To create a new, empty repository.

Repository:

Version control systems store all the data and metadata of the files in a folder referred to as “repository”. A folder is considered a repository if a version control system has been initialized to track changes in that folder.

In simple words, a repository is a folder that

  • stores a set of ordinary files
  • stores version-control-system-created files that contain the metadata and history of changes made to those ordinary files.
Working copy:

The working copy is unsaved state of the repository. You should distinguish between saving the file by an operating system and saving the state/version of the the file by version control systems. Your operating system stores/saves only the final version of your files. On the other hand, version control system (VSC) stores multiple versions of the same files.

For example, suppose in our repository there is a file, main.py with 10 lines of a code, and currently it is on its 2nd version. We added 100 lines of code to this file, but, we haven’t saved it as a 3rd version of the file yet. This is called a working copy of the file.
In other words, working copy of a repository contains changes that version control system hasn’t saved yet.

As the name implies, it is a working/unfinished version of the file. We are not ready yet to save/archive the this working copy of the file as a new version.

to Commit (verb):

Version control system (VCS) automatically tracks files by watching for changes between current state of our repository and
its last saved version. If some files in the reposity are modified, version control system notices it, but it does not save
these changes automatically. Rather we as a user should instruct the VCS to save these changes as a new version (of the files).
This action of instructing VCS to store the changes is called committing.
The collection of these changes specific to a version is called a commit (noun).

VCS also creates a metadata containing the timestamp that commit was made, and who made it and some other info.

a Commit (noun):

The collection of changes specific to a version is called a commit. A commit contains metadata that usually consists of commit id, the author information who made the commit, and a commit message that describes the change.

Commit message:

A short message, written by the commit author, that describes the commit. Commit message is stored in commit’s metadata. A good commit message consists of what has changed in this version and why it was changed.

Advice: You should commit your changes as frequently as possible. The creator of Linux kernel and Git, Linus Torvalds, says if you need to use more than one sentence to describe what you just did, it is too many changes for one commit. That’s because when you revert back to previous version (undo your changes), you lose too much of what you have done.

Local version control systems (LVCS)

Local version control systems (LVCS) manage changes to files on a single user’s local machine (computer). All versioned files and their history are stored on the user’s local system. This means that changes are tracked and managed directly on the user’s machine. (Unlike distributed version control systems or centralized version control system) LVCS lacks built-in mechanisms for collaboration among multiple users.

We can think of local version control systems (LVCS) as an offline word processor such as Microsoft Word. We can use it on our own, but we cannot collaborate with others. Collaboration can only occur through manual file sharing. If we want to collaborate, we have to send the files to our team members via email or other means.

As for the other two version control systems, namely centralized version control systems (CVCS) and distributed version control systems (DVCS), broadly speaking we can think of them as an online word processor similar to Google Docs. We can share the link to our team members and our team members can see the latest changes as we sync the files, and make changes to those documents.

In a nutshell, LVCS solve the problem of manually storing multiple copies (versions) of our files on a hard drive. The main disadvantage of Local Version Control Systems (LVCS) is that they don’t facilitate easy collaboration.

localVersionControlDiagram

Examples of Local Version Control Systems:

  • Source Code Control System (SCCS): One of the first version control systems, released in 1972, focused on source code. SCCS tracks changes and maintains file history. It is not maintained actively anymore and not recommended for use in new projects.

  • RCS (Revision Control System): Released in 1982, it was meant to be an alternative to SCCS. Security is not not up to modern standards.

Early LVCS operated only on single files meaning they could not track an entire project/repository as an unit (also called an atomic commit).

atomic commit:
Atomic commit treats changes to multiple files as one set. In an atomic commit if a commit involves changes to several files, all of changes are committed together successfully.

Why Atomic Commits Matter: A Practical Example

With atomic commits.

Imagine you have a project and you are using version control system to track/save different version of a project. Let’s say the project is a book (you are writing a novel). There are separate files for each chapter.

You want to keep/store the archives of the project (book) at different times. Even though there are many files (chapters), these files are inherently connected to each other since they are a part of the same book.

After writing a few chapters, You decide to rename your protagonist from “Sarah” to “Emma” throughout the entire book. This change affects every chapter file, but conceptually, you’re making one logical change: updating the character’s name.
You modify all affected chapter files and commit them together with the message “rename protagonist to Emma.” This is called an atomic commit.

If you later want to undo this change, one revert operation affects all files simultaneously, maintaining consistency across your entire project.

Essentially, in version control system that supports atomic commits, version control system keeps track of the entire project, and you can decide which files to include and not to include in each commit/archive.

Without atomic commits.

In version control systems that does not support atomic commits, each file has its own version history. One file might have 5 versions, another has 10 etc.

Using the above book example, if you want to change the name of the main character, you should save the new version of the each file separately.

To undo the name change later, you must remember to revert each file individually. It is both tedious and error-prone. You might accidentally miss reverting one chapter, leaving your story inconsistent.

Comments

Popular posts from this blog

Introduction to SQLFluff: How to make your SQL code clean and error-free

Image by Jake Aldridge from Pixabay You know oftentimes, the cause of runtime or compile errors and hours of debugging agony is all due to simply a missing semicolon. Have you ever had such experience? If you had, you are not alone. There are two ways to avoid these unfortunate situations: either become a perfect developer who never makes mistakes, or use helpful tools such as linters that can catch these errors early on. I am nowhere near being a perfect developer who never makes a mistake. In fact, I'm probably the opposite of a perfect developer, so even if I wanted to, I wouldn’t be able to teach you how to become a perfect developer. But what I can teach you is using linters. A Wikipedia defines a linter as a "static code analysis tool used to flag programming errors, bugs, stylistic errors and suspicious constructs." If you're not convinced yet on using linters, consider this scenario: in a large project with multiple members, different people tend to ...

How To Use KeePassXC Cli

There are similarly named programs: KeePass, KeePassX and KeePassXC (many of which are each others’ forks). Program Condition KeePass primarily for Windows. KeePassX no longer actively maintained. KeePassXC actively maintained and runs natively on Linux, macOS and Windows . Note: GUI version of the KeePassXC has more features than cli version. GUI version has variety of shortcuts as well. Regarding how to use GUI version of the KeePassXC, visit Getting Started Guide . Below features are available only in GUI version. Setting “Name” and “Description” fields of passwords database. Nesting Groups. Creating entry attributes ( open issue ). Adding Timed One-Time Passwords (TOTP). Adding entry with the same title as existing entry. KeePassXC stores all the passwords in passwords database. A passwords database (hereafter referred to as database) is an (encrypted) binary file. It can have any or no extension, but the .kdbx extension is commonly used. The ...

Git squash merge explained

There are many ways to integrate changes in git: regular / normal git merge, git squash merge, git rebase etc. This article explains git squash merge by comparing it to regular merge. Let’s use below example: In the repository with default main branch, after two commits, a new feature branch is created. Some work happened in feature branch. feature branch now has 2 commits that it shares with main branch, and three exclusive commits (exists only in feature branch). In the meantime, others worked on main branch and added two new commits (exists only in main branch). git log output of the main branch: c72d4a9 ( HEAD - > main ) fourth commit on main 2c3dd61 third commit on main 0c2eec3 second commit on main 9b968e8 first commit on main git log output of the feature branch: 786650f ( HEAD - > feature ) third commit on feature 21cbaf1 second commit on feature 677bc7f first commit on feature 0c2eec3 second commit on main 9b968e8 first commit on mai...

例を使ってSnowflakeストアドプロシージャを学びましょう

Image by Gerd Altmann from Pixabay データベースの操作において、反復的なタスクや複雑なロジックの実行は、時間と労力を要する作業になりがちです。Snowflakeストアドプロシージャは、こうした課題を解決するための強力な機能であり、SQLクエリを拡張して、より効率的かつ安全なデータ処理を実現します。 本稿では、Snowflakeストアドプロシージャの基本的な概念から、JavaScript、Python、そしてSnowflake Scripting (SQL)といった複数のプログラミング言語を使った作成方法、さらにはセキュリティ対策まで、実践的な知識を提供します。 小売業におけるキャンペーン管理を例に、県名に応じてキャンペーン情報と割引率を一括更新するストアドプロシージャを実装します。 ストアドプロシージャと言うのは ストアドプロシージャを関数の一つ種類と考えてもいいです。ストアドプロシージャを記述して、 SQL を実行する手続き型コードでシステムを拡張できます。ストアドプロシージャを作成すると、何度でも再利用できます。 値を明示的に返すことが許可されていますが、必須ではないです。ストアドプロシージャを実行するロールの権限だけではなく、プロシージャを所有するロールの権限でも実行出来ます。 サポートされている言語: Java JavaScript Python Scala Snowflake Scripting (SQL) ストアドプロシージャの形: CREATE OR REPLACE PROCEDURE プロシージャ名(arguments argumentsのタイプ) RETURNS レターんタイプ LANGUAGE 言語 -- (例:python, JavaScript等) -- RUNTIME_VERSION = '3.8' (言語がpython, java, scalaなら必要 ) -- PACKAGES = ('snowflake-snowpark-python') (言語がpython, java, scalaなら必要 ) -- HANDLER = 'run' (言語がpython, java, scalaなら必要 ) EXECUTE AS ...

Snowflake Load History vs Copy History: 7 differences

Image by Icons8_team from Pixabay Tracking data loads in Snowflake is crucial to maintaining data health and performance. Load History and Copy History are features that provide valuable information about past data loads. Understanding these features can help you efficiently troubleshoot, audit, and analyze performance. You might be wondering why two functions exist to achieve the same goal, what are the differences, which one I am supposed to use and when? In this article we will provide you with all the answers. So, let's learn what are the differences and when to use which! Load History vs Copy History: 7 differences Differences 1 and 2: views vs table function and Account Usage vs information Schema Here things get little confusing, bare with me, there are two Load History views, a view that belongs to Information Schema and a view that belongs to Account Usage schema . As for Copy History, there are Copy History table function of Information schema and a Copy H...

WinMerge のセットアップと使う方

WinMerge は、Windows 用のオープン ソースの差分およびマージ ツールです。WinMerge は、フォルダーとファイルの両方を比較し、違いを理解して扱いやすい視覚的なテキスト形式で表示します。この記事でWinMerge のセットアップと使う方を教えます。 source: https://winmerge.org WinMerge をダウンロード WinMerge のウェブサイト に行って、「WinMerge-2.16.44-x64-Setup.exe」ボタンを押し、WinMerge 2.16 をダウンロードしてください。 WinMerge をインストール ダウンロードされたソフトウェアをクリックし、ポップアップ画面で「Next」を押してください 「Languages」部分をスクロールダウンし、「Japanese menus and dialogs」を選択し、「Next」ボタンを押してください ターミナル等からも WinMerge をアクセス出来ようにする為に「Add WinMerge folder to your system path」オプションを選択し、希望によって他のオプション選択してください 「Enable Explorer context menu Integration」オプションを選択したら、フォルダ/ファイルを右キリックし、コンテクストメニューから WinMerge を開くようになります。 「Install」ボタンを押し、「Next」ボタンを押し、その後、「Finish」ボタンを押してください 言語を日本語にする もし WinMerge の言語が日本語じゃなくて、英語なら、「Edit」タブから「Options」を押してください。 ポップアップ画面で右側の下にある「Languages」と言うドロップダウンメニューから日本語を選択し、「OK」ボタンを押してください WinMerge を使う方 「ファイル」タッブから「開く」を押し 参照ボタンを押し、比較したいフォルダ・ファイルを指定 比較したいフォルダを指定する方法: ポップアップ画面から対象のフォルダーを選択し、「Open」を押してくだい 何も選択しないで、「Open」を押してくだい 右側下にある「比較」ボタンを押し ...

From Generic to Genius: Fine-tuning LLMs for Superior Accuracy in Snowflake

TL;DR: Cortex Fine-tuning is a fully managed service that lets you fine-tune popular LLMs using your data, all within Snowflake. While large language models (LLMs) are revolutionizing various fields, their "out-of-the-box" capabilities might not always align perfectly with your specific needs. This is where the power of fine-tuning comes into play. As it will be explained in this article, this feature empowers you to take a base LLM and customize it to excel in your particular domain. Here's the brief summary of why you might want to leverage Snowflake's fine-tuning capabilities: Unlocking Domain Expertise : Pre-trained LLMs are trained on massive, general datasets. Fine-tuning allows you to build upon this foundation and train the LLM further using data specific to your field, such as legal documents, medical records, or financial data. This empowers the LLM to understand complex terminology and patterns unique to your domain, leading to more accurate a...

脱初心者! Git ワークフローを理解して開発効率アップ

Git – チーム開発に必須のバージョン管理システムですが、その真価を発揮するにはワークフローの理解が欠かせません。 色々な人は Git の使い方を良く知っていますが、Git を仕事やワークフローに統合する方法を余り良く知らない人もいます。本記事では、Git をワークフローに組み込むことで、開発プロセスがどのように効率化され、チーム全体のパフォーマンスが向上するのかを解説します。Centralized Workflow から Forking Workflow まで、代表的な 9 つのワークフローの特徴を分かりやすく紹介します。それぞれのメリット・デメリット、そして最適なユースケースを理解することで、あなたのプロジェクトに最適なワークフローを選択し、開発をスムーズに進めましょう! Centralized Workflow Feature branching/GitHub Flow Trunk Based Flow Git Feature Flow Git Flow Enhanced Git Flow One Flow GitLab Flow Forking Workflow 分かりやすくするために、同じコンセプトを説明するに一つ以上の図を使った場合があります。 Centralized Workflow 説明: 集中化ワークフローではプロジェクトにおけるすべての変更の単一の入力箇所として中央リポジトリを使用します。デフォルトの開発用ブランチは main と呼ばれ、すべての変更がこのブランチにコミットされます。 集中化ワークフローでは main 以外のブランチは不要です。チームメンバー全員がひとつのブランチで作業し、変更を直接中央リポジトリにプッシュします。 メリット: SVN のような集中型バージョン管理システムから移行する小規模チームに最適。 デメリット: お互いのコードが邪魔になり (お互いの変更を上書きするように)、プロダクション環境にバグをい入れる可能性が高くて、複数のメンバいるチームでこのフローを使いにくい。 地図: graph TD; A[Central Repository] -->|Clone| B1[Developer A's Local Repo] A --...

Streamline Your Workflow: Send Snowflake Alerts to Slack

Do you know integrating Snowflake and Slack can make your life as a data engineer much easier?  Here's why: Real-time error catching and debugging : Instead of constantly checking logs for errors, you can set up Snowflake to automatically ping you in a Slack channel when something goes wrong. This is like having a dedicated assistant who watches for errors in your code and immediately lets you know so you can fix them faster. This is achieved through the use of webhooks, which are essentially automated HTTP requests that Snowflake sends to Slack when triggered by an event. Keep everyone in the loop : Slack integration also means you can keep your entire team informed about the status of data pipelines and other processes. You can configure Snowflake to send notifications to a shared channel whenever a pipeline completes, fails, or encounters an issue. This keeps everyone on the same page and avoids unnecessary status update meetings. This integration turns Slack ...

SQLFluff入門:SQLコードをクリーンかつエラーフリーに

コードを書いた後に実行したとき、エラーが発生するとイライラします。さらに厄介なのは、そのエラーの原因が分からないときです。また、複数のメンバーがいる大規模なプロジェクトでは、メンバーごとにコードの書き方が異なる傾向があり、その結果、コードレビューが難しくなり、ソースコードに不整合が生じます。コードを実行する前にエラーを検出できた方が良いと思いませんか?さらに、チームメンバー全員が同じフォーマットでコードを書けば、もっと効率的になるでしょう。 SQLFluffと言うツールがこの全ての事を実現させます。 SQLFluffは何でしょう? SQLFluffは、SQLファイル用の最も人気のあるリンターです。構文エラーを検出すると、そのエラーが発生した行番号や位置、エラーの原因が表示されます。SQLFluffはエラーの検出だけでなく、SQLコードのフォーマットや構文エラーの修正も可能です。PostgreSQL、MySQL、Google BigQuery、Snowflakeなど、複数の SQL 言語 をサポートしています。つまり、SQLコードを実行する前に構文エラーを検出・修正できるので、非常に役立ち、重要な作業に集中することができます。また、SQLFluffは非常に設定が簡単で、コンマの位置、文字の大文字小文字、インデントなどのルールを簡単に設定できます。 エンジニアは自分のパソコンにSQLFluffをインストールし、SQLFluffを利用してコードのエラーを検出・修正した後にGitにコミットし、GitLabやGitHubなどにプッシュすることをお勧めします。 全てのドキュメントはこちらにあります : Docs 。 インストール SQLFluff は以下のようにインストールできます VSCode エクステンション プリコミットフック コマンドラインツール CI/CDパイプラインツール SQLFluffをコマンドラインツールとして設定し、実行してくださいのが一番簡単です。また、この記事でプレコミットフックとしての使い方も説明します。 SQLFluffをコマンドラインツールとしてインストール 注意点: SQLFluffをインストールするにはPythonとpip (またはpoetryやpipenvなどのパッケージマネージャ)が必要です。この...