Besides File Landmarking is on the horizon for Mercurial - which I think is a great idea, disk space is cheap.<br><br>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.<br>
This also opens up the possibility of threaded branching - and "branch landmarking".<br><br>SCM Purists that come from non-distributed environments will begin hating Mercurial after these changes I'm sure.. :)<br>
<br>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.<br>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.<br>
<br>I know this wasn't about subversion but I think I would take git over subversion pretty much anyday.<br><br><br><div class="gmail_quote">On Fri, Dec 18, 2009 at 1:27 PM, Adam Tauno Williams <span dir="ltr"><<a href="mailto:awilliam@whitemice.org">awilliam@whitemice.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><div class="im">On Fri, 2009-12-18 at 12:03 -0500, Matt Michielsen wrote:<br>
> On Dec 18, 2009, at 11:18, "L. V. Lammert" <<a href="mailto:lvl@omnitec.net">lvl@omnitec.net</a>> wrote:<br>
> > Does anyone use Git in a consulting environment? Here is the<br>
> > situation:<br>
<br>
</div>Ha, I'd be willing to use git for sufficient amounts of money.<br>
Excessive complexity is the hallmark of consultant work after all.<br>
<div class="im"><br>
> >> I work from two or three different machines, and need to maintain a<br>
> > repository for my 'work'<br>
> >> There are other possible developers, so I have already setup a<br>
> >> 'master'<br>
> > repository at the client.<br>
> > I had originally thought that having my OWN 'working' repository would<br>
> > allow me to share environments between office, laptop, & netbook,<br>
> > but git<br>
> > does not seem to like two repositories (at least I can't get it<br>
> > working).<br>
> > So, the question - is maintiaing a 'work' repository and a 'master'<br>
> > respository a valid topology?<br>
</div><div class="im">> That sounds like a great idea. I personally use mercurial. You'll want<br>
> to start from the same repository though, then just push and pull<br>
> between the two.<br>
<br>
</div>Ditto, +1 Mercurial (Hg)<br>
<div><div></div><div class="h5"><br>
_______________________________________________<br>
grlug mailing list<br>
<a href="mailto:grlug@grlug.org">grlug@grlug.org</a><br>
<a href="http://shinobu.grlug.org/cgi-bin/mailman/listinfo/grlug" target="_blank">http://shinobu.grlug.org/cgi-bin/mailman/listinfo/grlug</a><br>
</div></div></blockquote></div><br>