[rspec-users] OT local version control?
tastapod at gmail.com
Tue Feb 5 05:19:42 EST 2008
I recently discovered a rather excellent online book:
It's about mercurial but it's a) largely scm-agnostic and b) really well
written, with some useful diagrams about how changesets work in the small
and collaboration models in the large (i.e. exactly what you were asking
I also discovered a "deal-breaker" feature of mercurial that I hadn't
realised before, which is that it tracks changes across copies and renames
of files. Or rather, what I hadn't realised is that other SCMs don't do
this. This was what was crippling me with subversion - I had a branch where
I had done some quite aggressive refactoring (which means files getting
moved and/or renamed), and subversion wouldn't merge the changes from the
branch onto trunk.
On 05/02/2008, Corey Haines <coreyhaines at gmail.com> wrote:
> Thanks for the response, Luis.
> I'm going through the user manual, and it looks like I can set up a main
> branch, make a clone, work on the clone with its own repository/revisions,
> then merge the changes back to the main branch when I'm ready. I like the
> idea of being able to work on several things at once. I'll let you guys know
> how it goes.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the rspec-users