On 1/11/2011 8:42 PM, [hidden email] wrote:
> A new version of Morphic was added to project The Inbox: > http://source.squeak.org/inbox/Morphic-MAD.512.mcz > > ==================== Summary ==================== > > Name: Morphic-MAD.512 > Author: MAD > Time: 11 January 2011, 9:42:18.437 pm > UUID: f79030b3-a48a-4fba-a6b6-ad4db0e21c99 > Ancestors: Morphic-ul.511 > > Updated TheWorldMainDockingBar>>extendingTheSystem to refer to a known good version of OmniBrowser. > > I'm not sure why the following changes were made - they're none of my doing: > D Morphic postscriptOfRemoval > D Morphic preamble > D Morphic postscript As general advice: Any changes you see that you didn't make, you need to revert. Committing changes you did not actually intend to make is a recipe for long-term disaster so don't. To revert changes do the following: 1) Select the package AND the repository the previous version came from 2) Click the "Changes" button in Monticello 3) Select any changes you didn't make and choose "revert" from the context menu 4) Repeat from step 2 to ensure you didn't miss anything. I do steps 1) and 2) before *every* commit in order to both, avoiding commits I didn't intend to make and also double-checking for any accidentals "self halts" or similar in the commit. Cheers, - Andreas |
On 11 January 2011 22:20, Andreas Raab <[hidden email]> wrote:
As general advice: Any changes you see that you didn't make, you need to revert. Committing changes you did not actually intend to make is a recipe for long-term disaster so don't. Thanks for the advice Andreas -- generally I am careful to avoid this state of affairs, but the presence of these particular changes threw me. I had downloaded a clean Squeak4.2-10856-beta.image, and had run an update which brought me up to 10881. At this point, before I'd actually made any changes directly, the Morphic package already had these three changes in it. I wasn't sure if I was seeing the after-effects of some clever post-postscript script clean-up, and that reverting these changes would thus cause a regression in the trunk... I've just had a look at an untouched 10856 image, and this also seems to have these unsaved changes already there, which again is not what I would have expected to see. Is there something obvious I'm missing here? Thanks, Michael |
On Tue, 11 Jan 2011, Michael Davies wrote:
> On 11 January 2011 22:20, Andreas Raab <[hidden email]> wrote: > >> As general advice: Any changes you see that you didn't make, you need to >> revert. Committing changes you did not actually intend to make is a recipe >> for long-term disaster so don't. >> > Thanks for the advice Andreas -- generally I am careful to avoid this state > of affairs, but the presence of these particular changes threw me. I had > downloaded a clean Squeak4.2-10856-beta.image, and had run an update which > brought me up to 10881. At this point, before I'd actually made any changes > directly, the Morphic package already had these three changes in it. I > wasn't sure if I was seeing the after-effects of some clever post-postscript > script clean-up, and that reverting these changes would thus cause a > regression in the trunk... > > I've just had a look at an untouched 10856 image, and this also seems to > have these unsaved changes already there, which again is not what I would > have expected to see. Is there something obvious I'm missing here? That image is not a clean Trunk image, but a modified one ([ReleaseBuilderTrunk prepareNewBuild] was evaluated before it was saved). Levente > > Thanks, > Michael > |
On 1/11/2011 2:17 PM, Levente Uzonyi wrote:
> On Tue, 11 Jan 2011, Michael Davies wrote: > >> On 11 January 2011 22:20, Andreas Raab <[hidden email]> wrote: >> >>> As general advice: Any changes you see that you didn't make, you need to >>> revert. Committing changes you did not actually intend to make is a >>> recipe >>> for long-term disaster so don't. >>> >> Thanks for the advice Andreas -- generally I am careful to avoid this >> state >> of affairs, but the presence of these particular changes threw me. I had >> downloaded a clean Squeak4.2-10856-beta.image, and had run an update >> which >> brought me up to 10881. At this point, before I'd actually made any >> changes >> directly, the Morphic package already had these three changes in it. I >> wasn't sure if I was seeing the after-effects of some clever >> post-postscript >> script clean-up, and that reverting these changes would thus cause a >> regression in the trunk... >> >> I've just had a look at an untouched 10856 image, and this also seems to >> have these unsaved changes already there, which again is not what I would >> have expected to see. Is there something obvious I'm missing here? > > That image is not a clean Trunk image, but a modified one > ([ReleaseBuilderTrunk prepareNewBuild] was evaluated before it was saved). Ah, good find. Guess we'll have to find out what was causing this. And thanks for reporting Michael! Cheers, - Andreas |
On Tue, 11 Jan 2011, Andreas Raab wrote:
> On 1/11/2011 2:17 PM, Levente Uzonyi wrote: >> On Tue, 11 Jan 2011, Michael Davies wrote: >> >>> On 11 January 2011 22:20, Andreas Raab <[hidden email]> wrote: >>> >>>> As general advice: Any changes you see that you didn't make, you need to >>>> revert. Committing changes you did not actually intend to make is a >>>> recipe >>>> for long-term disaster so don't. >>>> >>> Thanks for the advice Andreas -- generally I am careful to avoid this >>> state >>> of affairs, but the presence of these particular changes threw me. I had >>> downloaded a clean Squeak4.2-10856-beta.image, and had run an update >>> which >>> brought me up to 10881. At this point, before I'd actually made any >>> changes >>> directly, the Morphic package already had these three changes in it. I >>> wasn't sure if I was seeing the after-effects of some clever >>> post-postscript >>> script clean-up, and that reverting these changes would thus cause a >>> regression in the trunk... >>> >>> I've just had a look at an untouched 10856 image, and this also seems to >>> have these unsaved changes already there, which again is not what I would >>> have expected to see. Is there something obvious I'm missing here? >> >> That image is not a clean Trunk image, but a modified one >> ([ReleaseBuilderTrunk prepareNewBuild] was evaluated before it was saved). > > Ah, good find. Guess we'll have to find out what was causing this. And thanks > for reporting Michael! I guess it was MCPackageManager class >> #flushObsoletePackageInfos. >From http://lists.squeakfoundation.org/pipermail/squeak-dev/2011-January/156570.html : " Name: Monticello-bp.416 Author: bp Time: 7 January 2011, 10:51:28.009 pm UUID: 176c0d57-4da3-44ab-a30c-ed1b1eeae3c0 Ancestors: Monticello-ar.415 - move flushObsolotePackageInfos and cleanUp: from MCPackageManager to its subclass MCWorkingCopy to avoid losing all PackageInfos during aggressive clean up " Levente > > Cheers, > - Andreas > > > |
In reply to this post by Andreas.Raab
This one bit me and I had to get rabies shots. Don't end up like me!
Andreas, thanks. I wasn't totally clear on how to fix it when my commit wound up with unintended bits. Now I can't make any more excuses:) On Jan 11, 2011, at 1:20 PM, Andreas Raab <[hidden email]> wrote: > On 1/11/2011 8:42 PM, [hidden email] wrote: >> A new version of Morphic was added to project The Inbox: >> http://source.squeak.org/inbox/Morphic-MAD.512.mcz >> >> ==================== Summary ==================== >> >> Name: Morphic-MAD.512 >> Author: MAD >> Time: 11 January 2011, 9:42:18.437 pm >> UUID: f79030b3-a48a-4fba-a6b6-ad4db0e21c99 >> Ancestors: Morphic-ul.511 >> >> Updated TheWorldMainDockingBar>>extendingTheSystem to refer to a known good version of OmniBrowser. >> >> I'm not sure why the following changes were made - they're none of my doing: >> D Morphic postscriptOfRemoval >> D Morphic preamble >> D Morphic postscript > > As general advice: Any changes you see that you didn't make, you need to revert. Committing changes you did not actually intend to make is a recipe for long-term disaster so don't. > > To revert changes do the following: > 1) Select the package AND the repository the previous version came from > 2) Click the "Changes" button in Monticello > 3) Select any changes you didn't make and choose "revert" from the context menu > 4) Repeat from step 2 to ensure you didn't miss anything. > > I do steps 1) and 2) before *every* commit in order to both, avoiding commits I didn't intend to make and also double-checking for any accidentals "self halts" or similar in the commit. > > Cheers, > - Andreas > |
Free forum by Nabble | Edit this page |