[squeak-dev] The Trunk: Collections-fbs.516.mcz

Bert Freudenberg bert at freudenbergs.de
Fri May 3 11:42:14 UTC 2013


Good point, I'm not sure. Colin? If this is a problem we should disallow/warn about partial commits from merges.

- Bert -

On 2013-05-03, at 13:23, Nicolas Cellier <nicolas.cellier.aka.nice at gmail.com> wrote:

> A possible side effect with this scenario:
> 
> 1) I merge load trunk package version X
> 2) I merge a third-party version Z,
> 3) I partially publish version Y without the Z changes.
> 
> Will Z figure in the Y ancestors?
> If so, that might be a problem when later trying to merge Z again in another image...
> 
> Nicolas
> 
> 
> 2013/5/3 Bert Freudenberg <bert at freudenbergs.de>
> 
> On 2013-05-02, at 20:49, Frank Shearar <frank.shearar at gmail.com> wrote:
> 
> > On 2 May 2013 19:19, Chris Muller <asqueaker at gmail.com> wrote:
> >> Hmph -- since you were asking for consensus on something, it would be
> >> nice to have a little more time to respond -- as I did in < 24 hours,
> >> but still apparently too late.
> >>
> >>
> >> didn't get much discussion.  ay we please have more time
> >
> > Sure. In my defence, this was seriously getting in my way... but I
> > guess the response to that is "well keep the change in your image".
> > Ah, well.
> >
> > frank
> 
> 
> Maybe you should try my "allow partial commits" Monticello mod (Monticello-bf.540 in inbox). I have been using it for months now and it works really well. Back in January I got a few +1s but Chris was opposed so I did not put it into trunk, yet. I have not found the time to add the "do yet another snapshot when pressing save" Chris wanted because in my workflow it's not needed. But perhaps it's good enough? For me it certainly was a relief keeping some changes to my image while still being able to commit "clean" packages to trunk.
> 
> - Bert -
> 
> 
> 
> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20130503/a3a988ff/attachment.htm


More information about the Squeak-dev mailing list