Cool Tools: Distributed Source Control Systems (git + hg)

I assume you're already using version control: svn, cvs, or if you work at microsoft source depot (sd)

 Summary
If you don't know what git/github are, go download and start using it.  If you use hg and bitbucket, sigh, and switch to git/github.

What is DCVS?
Distributed Version Control Systems (DVCS) are version control systems (VCS) that don't rely on a single central server.  DVCS is designed so multiple people can check in independently while offline and then merge their changes together.

In DVCS systems everyone has a copy of the entire version control repository (repo), instead of just having a version of all the files .  Because you have the entire repo, you can check in at will, and when it's time to collaborate you can push your changes into someone elses repo.

A common question when VCS people come to DVCS is if you're distributed how do you know the version that should ship? Turns out even though everyone has their own repo, there is still a central repo that represents the truth.  Read  Joel to learn more.

The two major DCVS systems,  Git and Hg:
Today there are two competing DCVS systems  git and hg. Git is written by "C" developers,  and hg is written by python people.  The philosophy of these language permeates into these tools.  Hg, like python is "batteries included",  simple, easy to use, hard to get wrong. On the other hand git, like C, is "a fast car with no seatbelts". Fast, powerful, and easy to get wrong.

A few years ago, it wasn't clear which of hg or git would dominate the industry. Sadly today it's obvious git won, and hg will go the way of python - awesome tool, reasonable support, and interop with other systems, but ignored by the enterprise.  While git, like "C" is known and used by everyone.

So, if you're a normal developer, skip hg and use git.

Where to host the central server, GitHub and BitBucket:
As I said in the introduction, even with a DCVS you still tend to use a central server to host the repo of truth.  To meet this need both hg and git have a defacto standard code hosting company. For git, it's github, and for hg it's bitbucket.  Github is the better, and probably one of the contributing factors to the success of git.

Fighting the system, using hg with git:
Now, if you're the kind of developer who uses python for fun, I have a different recommendation. Learn git, just like you know C, but also learn hg. Use hg-git so you can use the hg tool chain on top of git repositories. This lets you interact with the git masses while getting all the benefits of hg.


Comments

Post a Comment

Popular posts from this blog

Finding CLR exceptions without visual studio

(If you want to understand what exception code 0xe0434352 is, read this post ) Often exceptions are thrown and caught and you don't see them. You probably know how to debug this in Visual Studio, so let me show you how to do it in cdb. Sample Code: class Program { static void Main(string[] args) { foreach (var x in Enumerable.Range(0,2000)) { Thread.Sleep(TimeSpan.FromSeconds(1)); Console.WriteLine("Hello World"); ThrowAndCatchException(); } } private static void ThrowAndCatchException() { try { throw new NotImplementedException(); } catch(Exception) { } } } Output of the application: Hello World Hello World Hello World Nothing about an exception, but you're sure it's happening behind the covers -- fire up cdb: C:\Program Files\Debugging Tools for Windows (x64)>cdb -pn consoleapplication3.exe <SNIP> ModLoad: 000007fe`f7e90000 000007fe`f7eb4000 C:\Windows\Mi...
Read more

Why do I keep getting exception code e0434352?

If you want to know how to debug CLR exceptions using cdb then read this post . Exception code e0434352 is the exception code used internally by the CLR to represent most exceptions(*). Regardless of if you throw a System.NullReferenceException or a System.ArgumentException in C#, you'll throw a SEH exception e0434352 under the covers. A fun way to validate this theory is to watch what happens to the CLR exceptions settings in cdb. Fire up cdb, and see the state of clr exceptions: 0:000> .shell -ci "sx" findstr clr clr - CLR exception - second-chance break - not handled clrn - CLR notification exception - break - handled .shell: Process exited Now, set the exception handler for exception number e0434352 and recheck the value of the clr exception handler: 0:000> sxe e0434352 0:000> .shell -ci "sx" findstr clr clr - CLR exception - break - not handled clrn - CLR notification exception - break - handled .shell: Process exited Armed with ...
Read more

Powershell script to enable windows to capture localhost traffic in wireshark

If you want to understand why the following scripts work read this post . Otherwise just paste the following into an elevated powershell window: Setup windows networking to allow localhost capturing in wireshark: # Find the network configuration that has the default gateway. $defaultAdapter = Get-WMIObject Win32_NetworkAdapterConfiguration | ? {$_.DefaultIPGateway} if (@($defaultAdapter).Length -ne 1) {throw "You don't have 1 default gateway, your network configuration is not supported" } # Route local IP address via the default gateway route add $defaultAdapter.IPAddress[0] $defaultAdapter.DefaultIPGateway Write-Host "Start capturing on localhost by connecting to $($defaultAdapter.IPAddress[0])" Return windows networking to normal configuration: # Find the network configuration that has the default gateway. $defaultAdapter = Get-WMIObject Win32_NetworkAdapterConfiguration | ? {$_.DefaultIPGateway} if (@($defaultAdapter).Length -ne 1) {throw "Y...
Read more