Hi simon
This is what I meant. I wanted to understand the problem because when
we merge this is important to see the diff.
stef
On Sep 27, 2008, at 10:07 PM, Simon Kirk wrote:
Hmm, OK, I've had a dig around.
I tried with a Pharo0.1-10074-oneclick package, and I think I see
what you mean: viewing changes via the MC browser on the package I
attached simply shows the entire method in red - even though if I go
and find the equivalent method in the image it exists and should be
showing changes instead.
I then tried with a Pharo0.1-PolymorphTT package, as I'm more
familiar with the diff tool from Gary's work. Again, the same problem.
However, if I load the MCZ into the package, then pick, say,
BrowserCommentTextMorph>>#hidePane and view the versions of the
method, I can then see both the original method (sd 11/20/2005
21:26) and Gary's new version, and the differences between the two.
So, perhaps the problem is that the Monticello browser can't show
you differences between methods when one method is in the image
under one class category, while the one in the Monticello package to
be loaded is under a different one (the method in this case is an
extension, so the method category for #hidePane would change from
"displaying" to "*Pinesoft-Fixes-Misc"
I hope that makes sense. I would have thought you would want to keep
the original method categories, just keeping the method source from
the MCZ.
Unfortunately my knowledge of managing such changes falls well short
of knowing how to go about that :(
Hope this has all made sense and is helpful
Cheers,
S
On 27 Sep 2008, at 06:58, Stéphane Ducasse wrote:
On Sep 26, 2008, at 10:07 PM, Simon Kirk wrote:
hi Stef.
Hmm, strange. How are you viewing the diffs? If I browse the MCZ
in a Monticello browser I see extensions to these classes:
BrowserCommentTextMorph
BrowserRequestor
CanvasCharacterScanner
Character
ConnectionQueue
GrafPort
MultiCanvasCharacterScanner
NaturalLanguageTranslator
Random
RemoteString
TranscriptStream
Is this the diffs you're talking about? If so, I think they're
correct. It's possible my rough list below may have missed some
changes.
I see the same but I cannot see the diff between the changes and
what is in the image (for example in the merge
tools I do not (changed) and the like.
Stef
Cheers,
Simon
On 26 Sep 2008, at 20:20, Stéphane Ducasse wrote:
Simon
with which machine did you create you mcz?
Because apparently I can see the diffs for other packages.
Can somebody else check the pinesoft package I put in the
pharoInbox?
Stef
Hi all.
Gary and I decided we ought to give out an MCZ of our fixes that
we've put together over the last two years.
Obviously some of those we found have been pulled into Pharo
already, but the attached MCZ represents those that we think are
still relevant :)
This is a rough list of the fixes:
1. Fixed flaky borwser comment text area sometime not showing.
2. Added getArgumentPermutation to support RefactoringEngine.
3. Fixes to CanvasCharacterScanner and
MultiCanvasCharacterScanner to correctly align the first line of
text when centered/justifed etc.
4. Added more constant names to Character class.
5. Modified ConnectionQueue to not accept connections when queue
is full.
6. Changed GrafPort to answer a MultiDisplayScanner when
appropriate (allows subclasses of MultiNewParagraph).
7. NaturalLanguageTranslator startup postion move to after
PasteUpMorph since it will show a progress bar.
8. Fix to Random>>nextInt: to allow large numbers which would be
out of range if using Floats (as mentioned recently on dev, use
of Floats is dodgy anyway...)
9. Changed TranscriptStream>>clear to use a new buffer (was just
reset which could leave a massive collection).
10. Changed RemoteString to handle concurrent processes safely.
This one's particularly interesting: we were load-testing our
Seaside app here and getting lots of syntax errors when hitting
the image with around the 20 concurrent processes due to source
file access. After this change we were hitting it with
approximately 500 concurrent processes, and the failure was in
the Java load tester (it timed out).
Hope just submitting a .mcz is OK! :)
Cheers,
Simon and Gary
******************************************************************************************************************************************
This email is from Pinesoft Limited. Its contents are
confidential to the intended recipient(s) at the email
address(es) to which it has been addressed. It may not be
disclosed to or used by anyone other than the addressee(s), nor
may it be copied in anyway. If received in error, please contact
the sender, then delete it from your system. Although this email
and attachments are believed to be free of virus, or any other
defect which might affect any computer or IT system into which
they are received and opened, it is the responsibility of the
recipient to ensure that they are virus free and no
responsibility is accepted by Pinesoft for any loss or damage
arising in any way from receipt or use thereof.
*******************************************************************************************************************************************
Pinesoft Limited are registered in England, Registered number:
2914825. Registered office: 266-268 High Street, Waltham Cross,
Herts, EN8 7EA
<Pinesoft-Fixes-Misc-gvc.24.mcz>
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-
project
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
******************************************************************************************************************************************
This email is from Pinesoft Limited. Its contents are confidential
to the intended recipient(s) at the email address(es) to which it
has been addressed. It may not be disclosed to or used by anyone
other than the addressee(s), nor may it be copied in anyway. If
received in error, please contact the sender, then delete it from
your system. Although this email and attachments are believed to
be free of virus, or any other defect which might affect any
computer or IT system into which they are received and opened, it
is the responsibility of the recipient to ensure that they are
virus free and no responsibility is accepted by Pinesoft for any
loss or damage arising in any way from receipt or use thereof.
*******************************************************************************************************************************************
Pinesoft Limited are registered in England, Registered number:
2914825. Registered office: 266-268 High Street, Waltham Cross,
Herts, EN8 7EA
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
*******************************************************************************************************************************************
This email is from Pinesoft Limited. Its contents are confidential
to the intended recipient(s) at the email address(es) to which it
has been addressed. It may not be disclosed to or used by anyone
other than the addressee(s), nor may it be copied in anyway. If
received in error, please contact the sender, then delete it from
your system. Although this email and attachments are believed to be
free of virus, or any other defect which might affect any computer
or IT system into which they are received and opened, it is the
responsibility of the recipient to ensure that they are virus free
and no responsibility is accepted by Pinesoft for any loss or damage
arising in any way from receipt or use thereof.
*******************************************************************************************************************************************
Pinesoft Limited are registered in England, Registered number:
2914825. Registered office: 266-268 High Street, Waltham Cross,
Herts, EN8 7EA
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
