Issue 6853 in pharo: Monticello merge conflicts on reordered package names

Status: Accepted
Owner: ----
Labels: Milestone-2.0 Type-Bug Target-RPackage Target-Monticello  
Importance-High

New issue 6853 by [hidden email]: Monticello merge conflicts on  
reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

Recently Monticello barks quite often about conflicting package names.

In most cases it is just the order that changed.

Solution:
- put the package names in an ordered collection and only then compare




Attachments:
        Screen Shot 2012-10-21 at 13.10.57.png  47.3 KB


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

Comment #1 on issue 6853 by [hidden email]: Monticello merge conflicts  
on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

that happens when trying to merge with packages saved with old method  
(packageinfo). Solution is to sort both arrays (incoming and outgoing)


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

Updates:
        Status: FixReviewNeeded

Comment #2 on issue 6853 by [hidden email]: Monticello merge conflicts  
on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

in  
SLICE-Issue-6853-Monticello-merge-conflicts-on-reordered-package-names-EstebanLorenzano.1


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

Updates:
        Status: MonkeyIsChecking

Comment #3 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853#c3

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: WorkNeeded

Comment #4 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853#c4

Monkey went bananas:
--------------------
Error while loading  
SLICE-Issue-6853-Monticello-merge-conflicts-on-reordered-package-names-EstebanLorenzano.1  
from http://ss3.gemstone.com/ss/PharoInbox:
        MessageNotUnderstood: GoferResolvedReference>>merge
  1: GoferResolvedReference(Object)>>doesNotUnderstand: #merge
  2: [self slice merge] in UlysseTheMonkey>>loadSlice
  3: BlockClosure>>on:do:
  4: UlysseTheMonkey>>loadSlice
  5: [self loadSlice] in UlysseTheMonkey>>loadAndTestSlice
  6: [loadStopwatch reset activate.
                aBlock value.
                loadStopwatch suspend.
                testResult := self runTests.
                self removeFalseErrors] in UlysseTheMonkey>>testChangeImpact:
  7: BlockClosure>>on:do:
  8: UlysseTheMonkey>>testChangeImpact:
  9: UlysseTheMonkey>>loadAndTestSlice
10: UlysseTheMonkey>>loadAndTest
        ...Test Results:
-------------
Passed: 6497
        CollectionsTests-Arrayed (553)
        CollectionsTests-Atomic (12)
        CollectionsTests-Sequenceable (912)
        CollectionsTests-SplitJoin (27)
        CollectionsTests-Stack (16)
        CollectionsTests-Streams (37)
        CollectionsTests-Strings (606)
        CollectionsTests-Support (12)
        CollectionsTests-Unordered (1954)
        CollectionsTests-Weak (739)
        CompilerTests (180)
        KernelTests-Chronology (592)
        KernelTests-Classes (68)
        KernelTests-Exception (2)
        KernelTests-Methods (179)
        KernelTests-Numbers (276)
        KernelTests-Objects (86)
        KernelTests-Pragmas (3)
        KernelTests-Processes (37)
        SUnit-Core-Extensions (3)
        SUnit-Core-Utilities (3)
        SUnit-Tests-Core (78)
        Tests-Monticello (122)


Failures: 1
        TimeTest>>#testGeneralInquiries

----------------------------------------------------------
Loaded Source:  
SLICE-Issue-6853-Monticello-merge-conflicts-on-reordered-package-names-EstebanLorenzano.1  
from http://ss3.gemstone.com/ss/PharoInbox
Tested using Pharo-2.0-20384-a on CoInterpreter  
VMMaker-oscog-EstebanLorenzano.166 uuid:  
5773fcb9-2982-4507-8a9e-4308ec33731e Nov  6 2012
StackToRegisterMappingCogit VMMaker-oscog-EstebanLorenzano.166 uuid:  
5773fcb9-2982-4507-8a9e-4308ec33731e Nov  6 2012
https://git.gitorious.org/cogvm/blessed.git Commit:  
a7bf128cd3b9389e77ea0cdec9a515282926a483 Date: 2012-11-02 14:17:44 +0100  
By: Esteban Lorenzano <[hidden email]> Jenkins build #136


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

Updates:
        Status: FixReviewNeeded

Comment #5 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

(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 #6 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853#c6

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: WorkNeeded

Comment #7 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853#c7

Monkey went bananas:
--------------------
Error while loading  
SLICE-Issue-6853-Monticello-merge-conflicts-on-reordered-package-names-EstebanLorenzano.1  
from http://ss3.gemstone.com/ss/PharoInbox:
        MessageNotUnderstood: GoferResolvedReference>>merge
  1: GoferResolvedReference(Object)>>doesNotUnderstand: #merge
  2: [self slice merge] in UlysseTheMonkey>>loadSlice
  3: BlockClosure>>on:do:
  4: UlysseTheMonkey>>loadSlice
  5: [self loadSlice] in UlysseTheMonkey>>loadAndTestSlice
  6: [loadStopwatch reset activate.
                aBlock value.
                loadStopwatch suspend.
                testResult := self runTests.
                self removeFalseErrors] in UlysseTheMonkey>>testChangeImpact:
  7: BlockClosure>>on:do:
  8: UlysseTheMonkey>>testChangeImpact:
  9: UlysseTheMonkey>>loadAndTestSlice
10: UlysseTheMonkey>>loadAndTest
        ...
----------------------------------------------------------
Loaded Source:  
SLICE-Issue-6853-Monticello-merge-conflicts-on-reordered-package-names-EstebanLorenzano.1  
from http://ss3.gemstone.com/ss/PharoInbox
Tested using Pharo-2.0-20384-a on CoInterpreter  
VMMaker-oscog-EstebanLorenzano.166 uuid:  
5773fcb9-2982-4507-8a9e-4308ec33731e Nov  6 2012
StackToRegisterMappingCogit VMMaker-oscog-EstebanLorenzano.166 uuid:  
5773fcb9-2982-4507-8a9e-4308ec33731e Nov  6 2012
https://git.gitorious.org/cogvm/blessed.git Commit:  
a7bf128cd3b9389e77ea0cdec9a515282926a483 Date: 2012-11-02 14:17:44 +0100  
By: Esteban Lorenzano <[hidden email]> Jenkins build #136


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

Updates:
        Status: HumanReviewNeeded

Comment #8 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

(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: FixToInclude

Comment #9 on issue 6853 by [hidden email]: Monticello merge conflicts  
on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

(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 #10 on issue 6853 by [hidden email]: Monticello merge  
conflicts on reordered package names
http://code.google.com/p/pharo/issues/detail?id=6853

in 2.0 386


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