Issue 6294 in pharo: Update improvement 2

Status: Accepted
Owner: [hidden email]
Labels: Type-Feature Milestone-2.0

New issue 6294 by [hidden email]: Update improvement 2
http://code.google.com/p/pharo/issues/detail?id=6294

Do not show the merge UI if there is no conflict

-------------------
Slice is in the inbox


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

Updates:
        Status: FixReviewNeeded

Comment #1 on issue 6294 by [hidden email]: Update improvement 2
http://code.google.com/p/pharo/issues/detail?id=6294#c1

(No comment was entered for this change.)


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

Updates:
        Status: MonkeyIsChecking

Comment #2 on issue 6294 by [hidden email]: Update improvement 2
http://code.google.com/p/pharo/issues/detail?id=6294#c2

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

Updates:
        Status: ValidatedByTheMonkey
        Labels: CheckedIn20191

Comment #3 on issue 6294 by [hidden email]: Update improvement 2
http://code.google.com/p/pharo/issues/detail?id=6294#c3

This Issue has been checked by Ulysse the Monkey
       
6327 tests passed in 00:03:08s:
===============================
        CollectionsTests-Arrayed (547)
        CollectionsTests-Atomic (12)
        CollectionsTests-Sequenceable (906)
        CollectionsTests-SplitJoin (27)
        CollectionsTests-Stack (16)
        CollectionsTests-Streams (37)
        CollectionsTests-Strings (596)
        CollectionsTests-Support (12)
        CollectionsTests-Unordered (1951)
        CollectionsTests-Weak (739)
        CompilerTests (179)
        KernelTests-Chronology (578)
        KernelTests-Classes (67)
        KernelTests-Exception (2)
        KernelTests-Methods (178)
        KernelTests-Numbers (276)
        KernelTests-Objects (86)
        KernelTests-Pragmas (3)
        KernelTests-Processes (31)
        SUnit-Core-Extensions (3)
        SUnit-Core-Utilities (3)
        SUnit-Tests-Core (78)

----------------------------------------------------------
Loaded Source: SLICE-Issue-6294-Update-improvement-2-BenjaminVanRyseghem.1  
from http://ss3.gemstone.com/ss/PharoInbox
Tested using Pharo-2.0-20191-a on CoInterpreter  
VMMaker-oscog-EstebanLorenzano.161 uuid:  
8e0c22c3-b48d-4d8d-a7f9-8a75dc246f28 Jul  5 2012,  
StackToRegisterMappingCogit VMMaker-oscog-EstebanLorenzano.161 uuid:  
8e0c22c3-b48d-4d8d-a7f9-8a75dc246f28 Jul  5 2012,  
https://git.gitorious.org/cogvm/blessed.git Commit:  
8216bc960dcf8ddab3a2f6fb54cc97214e7797fd Date: Thu Jul 5 09:41:44 2012  
+0200 By: Esteban Lorenzano <[hidden email]>


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

Updates:
        Status: FixToInclude

Comment #4 on issue 6294 by [hidden email]: Update improvement 2
http://code.google.com/p/pharo/issues/detail?id=6294

(No comment was entered for this change.)


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

Updates:
        Status: Integrated

Comment #5 on issue 6294 by [hidden email]: Update improvement 2
http://code.google.com/p/pharo/issues/detail?id=6294

in 2.0 192


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