[squeak-dev] The Trunk: Monticello-cmm.585.mcz

Tobias Pape Das.Linux at gmx.de
Thu Jan 30 17:16:22 UTC 2014


On 30.01.2014, at 17:43, Chris Muller <asqueaker at gmail.com> wrote:

> That's for adding an ancestor, right?  That's a very rare use-case, I
> never used it even once.
> 
> And, I still fail to understand how it results in duplicate -- if it
> is already part of ancestry, why adopt it again?

So I can do the monticello equivalent of a git squash:

Base version is Knorz-cmm.24.mcz
I develop say, version 25, 26, 27, 28 in my own repo.
and then I want to publish.
So I adopt your version again as ancestor and commit 
Knorz-topa.29.mcz, which has
	Knorz-topa.28.mcz, Knorz-cmm.24.mcz
as ancestors. Then, you can view diffs more easily.

see also here: https://stackoverflow.com/questions/20966089/monticello-workflow-for-simultaneous-collaborative-development-correctly-numb/20974576#20974576


Also, I had to do that in SqueakSource to cross-merge features
from different SqueakSource-forks more easily.

Best
	-Tobias
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1665 bytes
Desc: Message signed with OpenPGP using GPGMail
Url : http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20140130/40b4a002/signature.pgp


More information about the Squeak-dev mailing list