<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><div>Good point, I'm not sure. Colin? If this is a problem we should disallow/warn about partial commits from merges.</div><div><br></div><div><span class="Apple-style-span" style="border-collapse: separate; border-spacing: 0px; font-size: 12px; "><div style="font-family: Helvetica; ">- Bert -</div><br class="Apple-interchange-newline"></span></div><div><div>On 2013-05-03, at 13:23, Nicolas Cellier <<a href="mailto:nicolas.cellier.aka.nice@gmail.com">nicolas.cellier.aka.nice@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr"><div><div>A possible side effect with this scenario:<br><br>1) I merge load trunk package version X<br>2) I merge a third-party version Z,<br>3) I partially publish version Y without the Z changes.<br><br>Will Z figure in the Y ancestors?<br>
</div>If so, that might be a problem when later trying to merge Z again in another image...<br><br></div>Nicolas<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">2013/5/3 Bert Freudenberg <span dir="ltr"><<a href="mailto:bert@freudenbergs.de" target="_blank">bert@freudenbergs.de</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im"><br>
On 2013-05-02, at 20:49, Frank Shearar <<a href="mailto:frank.shearar@gmail.com">frank.shearar@gmail.com</a>> wrote:<br>
<br>
> On 2 May 2013 19:19, Chris Muller <<a href="mailto:asqueaker@gmail.com">asqueaker@gmail.com</a>> wrote:<br>
>> Hmph -- since you were asking for consensus on something, it would be<br>
>> nice to have a little more time to respond -- as I did in < 24 hours,<br>
>> but still apparently too late.<br>
>><br>
>><br>
>> didn't get much discussion. ay we please have more time<br>
><br>
> Sure. In my defence, this was seriously getting in my way... but I<br>
> guess the response to that is "well keep the change in your image".<br>
> Ah, well.<br>
><br>
> frank<br>
<br>
<br>
</div>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.<br>
<span class="HOEnZb"><font color="#888888"><br>
- Bert -<br>
<br>
<br>
<br>
</font></span></blockquote></div><br></div>
<br></blockquote></div><br></body></html>