Issue 4602 in pharo: Fixes and Improvements on MC

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
15 messages Options
Reply | Threaded
Open this post in threaded view
|

Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Status: New
Owner: ----

New issue 4602 by [hidden email]: Fixes and Improvements on MC
http://code.google.com/p/pharo/issues/detail?id=4602

MCPatchOperation
  - fixed two possible locations of infinite loops detected (discovered when  
using the MCMergeBrowser)
  - added MCVersionMerger >> addVersions:
  - MCVersionMerger minor reformattings
  - MCVersionLoader do not show a debug message when there are local  
conflicting changes on load => open merger view instead


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #1 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

see SLICE-Issue-4602-Fixes-and-Improvements-on-MC-CamilloBruni.1


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Status: ReviewNeeded
        Labels: Milestone-1.4

Comment #2 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

did you run the test?
I asked because if MC is one its knees we will get problems :)


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #3 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

I have 5 tests failing, the same ones as in the latest 1.4 image loaded  
from jenkins...

but I just figured out a wrong dependency (model => view) let me fix that  
first


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #4 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

hmm seems like its ok. But I am still unsure whether this can break  
something...

MCVersionLoader >> warnAboutLosingChangesTo: versionCollection

instead of going to notify the user I ran the merger... according to the  
tests everything should be fine (or as broken as before)


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #5 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

Please send an email to the mailing-list to ask for feedback on your ideas.
This is important that people react and we get a shared view.
For my part I would rewrite from scratch the MC browser.



_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Status: Accepted

Comment #6 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

Slice is not in the 1.4 inbox


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Labels: Type-Bug

Comment #7 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

(No comment was entered for this change.)


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Status: MonkeyIsChecking

Comment #8 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602#c8

The Monkey is currently checking this issue. Please don't change it!


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Status: FixToInclude

Comment #9 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602#c9

This Issue has been checked by Ulysse the Monkey
       
6203 tests passed in 00:01:16s:
===============================
        CollectionsTests-Arrayed (562)
        CollectionsTests-Atomic (12)
        CollectionsTests-Sequenceable (912)
        CollectionsTests-SplitJoin (27)
        CollectionsTests-Stack (16)
        CollectionsTests-Streams (37)
        CollectionsTests-Strings (590)
        CollectionsTests-Support (12)
        CollectionsTests-Text (40)
        CollectionsTests-Unordered (1977)
        CollectionsTests-Weak (751)
        CompilerTests (30)
        KernelTests-Chronology (574)
        KernelTests-Classes (59)
        KernelTests-Exception (2)
        KernelTests-Methods (177)
        KernelTests-Numbers (232)
        KernelTests-Objects (85)
        KernelTests-Pragmas (3)
        KernelTests-Processes (22)
        SUnit-Core-Extensions (3)
        SUnit-Core-Utilities (3)
        SUnit-Tests-Core (77)

----------------------------------------------------------
Loaded Source: SLICE-Issue-4602-Fixes-and-Improvements-on-MC-CamilloBruni.5  
from http://ss3.gemstone.com/ss/PharoInbox
Tested using Pharo-1.4-14172-a on Croquet Closure Stack VM  
[StackInterpreter VMMaker-oscog-EstebanLorenzano.109] 21.0


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #10 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

I loveeeeeee the loaded Source and the monkey!!!



_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Status: FixReviewNeeded

Comment #11 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

(No comment was entered for this change.)


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #12 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

Camillo
There is a conflicts and only the latest slice contains something.
Could you review your changes and let me know? we can sit together and you  
show that to me too.


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo

Comment #13 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

Ok friday!



_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 4602 in pharo: Fixes and Improvements on MC

pharo
Updates:
        Status: Closed

Comment #14 on issue 4602 by [hidden email]: Fixes and Improvements  
on MC
http://code.google.com/p/pharo/issues/detail?id=4602

in 143012


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker