[squeak-dev] More distributed version control
Colin Putney
cputney at wiresong.ca
Thu Apr 9 06:35:52 UTC 2009
Frank Shearar wrote:
> I've not used MC2, so if you can selectively commit parts of what you've
> changed, I'd be very happy. Or, to make me just as happy, point out the
> MC1 feature I'd missed.
In MC2 you can only commit code that's active in the image. When
merging, you can selectively apply changes *to* the image, and then
commit that.
MC1 has a feature that's like cherry-picking, though slightly less
direct. Backporting allows you to choose a subset of changes to apply to
an ancestor of the current version. Then you can commit a new version
based on those changes, and merge it with the head. The end result is
similar to cherry-picking the changes.
Colin
More information about the Squeak-dev
mailing list
|