Re: Git & rebase

Date: 2011-06-29 05:55 am (UTC)
jhw: baleful eye (Default)
From: [personal profile] jhw
> I feel like this post is from someone who was using git back in the early days...

I currently use both Git and Subversion on a daily basis in a large, well-respected software organization with a source code base that numbers into the hundreds of millions of lines of code with a history going back at least thirty years in the case of the main body of code in my principle area of responsibility. The sun never sets on the data centers where these repositories and their mirrors are hosted. I'm not in a position to argue with a whole building full of people who insist on using "the wrong workflow" with Git, whatever that happens to be from your point of view.

I routinely use Mercurial as front-end to both of Git and Subversion, because I'm willing to pay for a bit of added round-trip time when pushing to and pulling from the integration repositories in exchange for a simplified workflow in my day-to-day development work. This makes me acutely aware of the shortcomings in both Git and Subversion, which are different in each case, worse in the case of Subversion to be sure, but Git has at least one serious flaw as well, as I write above.

> I miss my integrated lightweight branching. (I don't want to use an extension...

It's not an extension in Mercurial. Bookmarks are a core feature of the tool, present without you even having to add a single line to your .hgrc file or install anything separately. Moreover, you can even dispense with bookmarks and work with anonymous heads if you're really pressed for time.

Look, I wasn't kidding when I said that you can do a round-trip conversion of a Git repository into and back out of Mercurial without losing any data. There's even a way to do that in the other direction as long as the Git commit logs adhere to the convention required my Mercurial for storing the branch name.

I've read the Pro Git book. It doesn't tell me anything I don't already know. High on the list of what I want it to tell me, which it doesn't say a damned thing about, is why on Carlin's Green Earth there should be any good reason to use the receive.denyNonFastForwards setting on the server.
From:
Anonymous( )Anonymous This account has disabled anonymous posting.
OpenID( )OpenID You can comment on this post while signed in with an account from many other sites, once you have confirmed your email address. Sign in using OpenID.
User (will be screened)
Account name:
Password:
If you don't have an account you can create one now.
Subject:
HTML doesn't work in the subject.

Message:

 
Notice: This account is set to log the IP addresses of everyone who comments.
Links will be displayed as unclickable URLs to help prevent spam.

Profile

jhw: baleful eye (Default)
j h woodyatt

August 2012

S M T W T F S
   1234
567891011
121314 15161718
19202122232425
262728293031 

Most Popular Tags

Style Credit

Expand Cut Tags

No cut tags
Page generated Oct. 20th, 2017 02:24 pm
Powered by Dreamwidth Studios