On Oct 6, 4:12 pm, "Brian Mathis" <[EMAIL PROTECTED]> wrote:
> On Mon, Oct 6, 2008 at 4:17 PM, dd-b <[EMAIL PROTECTED]> wrote:
> > On Oct 3, 5:00 pm, "Brian Mathis" <[EMAIL PROTECTED]> wrote:
> >> On Fri, Oct 3, 2008 at 5:24 PM, dd-b <[EMAIL PROTECTED]> wrote:
>
> >> > For me, source control doesn't address the same problem. I'm using
> >> > source control on my puppet files collection, but I periodically need
> >> > access to old versions intermediate between when I have now and what I
> >> > last committed. Except for Sun's old (and otherwise disastrous) NSE
> >> > and a small-company product called DRTS that I don't think exists any
> >> > more either, I haven't run into a version-control system that handles
> >> > that case decently.
>
> >> It sounds like you need to be committing more often. There should
> >> never be a time when you have a config that you find useful (ie:
> >> something that you are satisfied is working) that is not committed.
> >> If you find that you need revisions that are "in between" two commits,
> >> then you didn't commit often enough.
>
> > Sometimes I need access to versions more recent than the last commit
> > during periods when the code wasn't even compiling cleanly (never mind
> > "working") -- clearly such code should *not* be checked in to the
> > public repository! (The thing with NSE and DRTS was that you had a
> > private repository as well as one or more layers of public ones, so I
> > could check into my private one as often as you (and I) think is
> > useful without exposing my intermediate states to the world. I've
> > since my previous post seen that GIT, which is actually current and
> > even relevant to Puppet, may also support that working style.)
>
> > Also, I have to make a conscious decision to commit, and it's easier
> > to just version the saves than to do manual commits and make up
> > comments and so forth that frequently.
>
> Still, it sounds like you need to modify your workflow instead of
> blaming the revision software. There's a reason the market has chosen
> these kinds of revision systems.
I see that kind of differently. Your proposed workflow (below) is
working around a weakness that's unfortunately prevalent in the
mainstream version control software today, at some considerable
increase in complexity and risk of error.
>
> I think what you need to be doing is:
> - When you start making changes, make a branch in your RCS
Yeah, if you do that you can of course commit a lot more often. Do
the comments from those commits get rolled up into the trunk when you
merge back, though? Or do they get lost?
I haven't yet worked someplace that uses that as a normal approach,
though I've considered trying to introduce it. The problem I see is
that CVS and Subversion handle branches sufficiently poorly that it's
kind of a pain to do. And there's some real risk of merging the wrong
stuff, or merging it wrong, since there's a lot of manual keeping
track of things required.
I haven't used GIT, but reading the documentation, I think it may
handle things a lot more nicely.
[snip stuff I agree with]
> Look at it this way: the rest of the open source (and many closed
> source) world uses these types of RCS systems just fine, so either:
> a) you are much smarter than everyone else and could become a
> millionaire with your approach
> - OR -
> b) you might learn a thing or two by looking at how most other people do it
I've been learning things from how other people do it for quite a
while now. But I haven't before this met *anybody* or any place that
does it the way you describe using current-generation tools, so if
"most people" do it that way, it's news to me. It's the working style
I learned to like with NSE and DRTS, but I haven't been able to use it
since then because of poor tool support.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Puppet Users" group.
To post to this group, send email to puppet-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/puppet-users?hl=en
-~----------~----~----~----~------~----~------~--~---
