[Seaside] monticello remote repositories

Andreas Raab seaside@lists.squeakfoundation.org
Mon, 30 Dec 2002 00:59:43 +0100


Julian,

> http://www.beta4.com/squeak/aubergines/docs/monticello.html

Reading through it and noticing in particular the parts on:

	"Update: If the selected package is not yet loaded, load it into
your image. Otherwise, merge into the local image any changes committed
to the repository since your last update. This will not remove any
changes you are in the process of making. If changes committed to the
repository conflict with your local changes, a dialog will ask you to
pick a version of the conflicting method."

and

	"The UI (particularly for conflict resolution) is very
primitive."

I thought it would be _very_ worthwhile to put in a note about "versions
of methods" (assuming that this hasn't been changed in Monticello). I
don't know if you ever use this but I do all the time and what it
essentially means is that except in the case that you have a conflict in
critical code that you are currently running you could actually just
file in the stuff from the server and then open up a "message list" on
those methods that have changed and show the diffs to their last (e.g.,
locally modified) version. In which case you got everything you need for
conflict resolution.

I haven't used Monticello myself but given the experience I have of
wading through lots of change sets and try to figure out "where exactly
a particular method broke" I found the versions and the diffs to be
incredibly useful and I would guess that they'd probably solve 95% of
the problems with conflicting methods in practice (the remaining 5% are
those places where you _do_ update code that you've changed locally and
that is running).

Cheers,
  - Andreas