[squeak-dev] Monticello Workflow

Chris Muller asqueaker at gmail.com
Sun Aug 18 17:47:19 UTC 2013


On Fri, Aug 16, 2013 at 3:09 PM, Jeff Gonis <jeff.gonis at gmail.com> wrote:
> Hi Everyone,
> So its time for my annual Monticello question to the squeak-dev list. This
> time I am trying to refresh my memory of how Monticello works and the
> workflow I should use for distributed development with it.
> My basic setup is as follows: I have a personal repository in a directory on
> my personal computer and the person I am working with has the same.  There
> is a "central" repository set up on a server as well.  Ideally I would grab
> the latest changes from the "central" repository and spend some time working
> away, committing to my personal repository throughout the day, and my
> co-worker would be doing the same with their personal repository.
> At some point I'll be satisfied with my changes and I'll want to upload them
> to the "central" repository. Based on my intuition I would first want to
> "merge" in the latest version from the "central" repository so that I deal
> with any conflicts. Ok, I can do this, it seems straightforward.  Now having
> done that my package lists both my latest local version and the version I
> merged in from the "central" repository beside the package name.
> I would think at this point that the correct move would be to save the
> package to my personal repository, and then Copy that version from my
> computer up to the "central" repository.  Does this sound about right for
> enabling distributed development, and avoiding conflicts?  One question I
> would ask is, that when I go to save to my personal repository after doing
> this, I get a warning telling me that the version in my personal repository
> may be newer than the version that I am trying to save.  This doesn't seem
> right though, or at least I don't understand the reasoning behind this
> warning.
> Anyway, if this is totally the wrong way to do distributed development,
> please let me know.  If I am on the right track but confused about some
> critical details please let me know that too.
> Thanks,
> Jeff

More information about the Squeak-dev mailing list