[GRLUG] Git 'philosophy'

[Ben DeMott]

Besides File Landmarking is on the horizon for Mercurial - which I think is
a great idea, disk space is cheap.

Basically file landmarking makes it so the entire repository / changelog /
diffs don't have to be read to rebuild the history of a given file at a
given point in time.
This also opens up the possibility of threaded branching - and "branch
landmarking".

SCM Purists that come from non-distributed environments will begin hating
Mercurial after these changes I'm sure.. :)

Sadly we still use subversion at work - but I just let Netbeans do conflict
resolution magic for me... I honestly don't know if my project would merge
correctly right now - it probably won't.
I would say on average the developer that manages subversion spends a day
every 2 weeks just dealing with *issues* or making it behave, or getting it
to play nice with our build server.

I know this wasn't about subversion but I think I would take git over
subversion pretty much anyday.


On Fri, Dec 18, 2009 at 1:27 PM, Adam Tauno Williams <awilliam at whitemice.org
> wrote:

> On Fri, 2009-12-18 at 12:03 -0500, Matt Michielsen wrote:
> > On Dec 18, 2009, at 11:18, "L. V. Lammert" <lvl at omnitec.net> wrote:
> > > Does anyone use Git in a consulting environment? Here is the
> > > situation:
>
> Ha, I'd be willing to use git for sufficient amounts of money.
> Excessive complexity is the hallmark of consultant work after all.
>
> > >> I work from two or three different machines, and need to maintain a
> > > repository for my 'work'
> > >> There are other possible developers, so I have already setup a
> > >> 'master'
> > > repository at the client.
> > > I had originally thought that having my OWN 'working' repository would
> > > allow me to share environments between office, laptop, & netbook,
> > > but git
> > > does not seem to like two repositories (at least I can't get it
> > > working).
> > > So, the question - is maintiaing a 'work' repository and a 'master'
> > > respository a valid topology?
> > That sounds like a great idea. I personally use mercurial. You'll want
> > to start from the same repository though, then just push and pull
> > between the two.
>
> Ditto, +1 Mercurial (Hg)
>
> _______________________________________________
> grlug mailing list
> grlug at grlug.org
> http://shinobu.grlug.org/cgi-bin/mailman/listinfo/grlug
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://shinobu.grlug.org/pipermail/grlug/attachments/20091218/c1d8f55a/attachment.htm