[Pharo-project] Blocked while merging
Hi all I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs - click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed. Does anybody get the same, I'm using pharo 10248 Stef
Hi all did you see this mail because I'm really blocked and cannot merge anymore in pharo. Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Hi Stef. For the old MC browser the revertSelection option doesn't have the code to do the option, seems to be present in 3.10 images though... I don't get a DNU for the diff option. As for the Polymorph tool, it looks like there can be cases where there is a conflict with a deletion present in the incoming version of the merge. Try replacing PSMCMergePatchMorph>>selectNextConflict with: selectNextConflict "Select the next conflict after the current selection, if any." |next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString} And, if that works in your case I'll version up the change and put on SqueakSource. None of these issues should actually prevent you from merging, as such though. Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging Hi all did you see this mail because I'm really blocked and cannot merge anymore in pharo. Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Apparently with your fix I could merge. I will retry to be sure. On Mar 12, 2009, at 11:10 AM, Gary Chambers wrote:
Hi Stef. For the old MC browser the revertSelection option doesn't have the code to do the option, seems to be present in 3.10 images though... I don't get a DNU for the diff option.
As for the Polymorph tool, it looks like there can be cases where there is a conflict with a deletion present in the incoming version of the merge.
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
apparently I redid a merge and I got blocked again so I do not know what to do. next remoteDefinition is nil :( Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Yesterday I merged and it worked. I got this error when clicking on the button on the left side of the window ("2 conflicts" or something). Adrian On Mar 12, 2009, at 15:21 , Stéphane Ducasse wrote:
apparently I redid a merge and I got blocked again so I do not know what to do.
next remoteDefinition is nil :(
Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
What is "blocking" you exactly? Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, March 12, 2009 2:21 PM Subject: Re: [Pharo-project] Blocked while merging apparently I redid a merge and I got blocked again so I do not know what to do. next remoteDefinition is nil :( Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
I will retry and put an image somewhere. Stef
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, March 12, 2009 2:21 PM Subject: Re: [Pharo-project] Blocked while merging
apparently I redid a merge and I got blocked again so I do not know what to do.
next remoteDefinition is nil :(
Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
I redid everything and apparently everything is working with your fix. Thanks On Mar 12, 2009, at 3:44 PM, Gary Chambers wrote:
What is "blocking" you exactly?
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, March 12, 2009 2:21 PM Subject: Re: [Pharo-project] Blocked while merging
apparently I redid a merge and I got blocked again so I do not know what to do.
next remoteDefinition is nil :(
Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
so should I add it or you integrate it and I push it into the stream? Stef On Mar 13, 2009, at 3:42 PM, Stéphane Ducasse wrote:
I redid everything and apparently everything is working with your fix. Thanks
On Mar 12, 2009, at 3:44 PM, Gary Chambers wrote:
What is "blocking" you exactly?
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, March 12, 2009 2:21 PM Subject: Re: [Pharo-project] Blocked while merging
apparently I redid a merge and I got blocked again so I do not know what to do.
next remoteDefinition is nil :(
Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo- project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
In Polymorph-Tools-Diff-gvc.14 Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Friday, March 13, 2009 3:26 PM Subject: Re: [Pharo-project] Blocked while merging so should I add it or you integrate it and I push it into the stream? Stef On Mar 13, 2009, at 3:42 PM, Stéphane Ducasse wrote:
I redid everything and apparently everything is working with your fix. Thanks
On Mar 12, 2009, at 3:44 PM, Gary Chambers wrote:
What is "blocking" you exactly?
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, March 12, 2009 2:21 PM Subject: Re: [Pharo-project] Blocked while merging
apparently I redid a merge and I got blocked again so I do not know what to do.
next remoteDefinition is nil :(
Stef
Try replacing PSMCMergePatchMorph>>selectNextConflict with:
selectNextConflict "Select the next conflict after the current selection, if any."
|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}
And, if that works in your case I'll version up the change and put on SqueakSource.
None of these issues should actually prevent you from merging, as such though.
Regards, Gary
----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, March 10, 2009 10:22 AM Subject: Re: [Pharo-project] Blocked while merging
Hi all
did you see this mail because I'm really blocked and cannot merge anymore in pharo.
Stef On Mar 9, 2009, at 1:56 PM, Stéphane Ducasse wrote:
Hi all
I wanted to merge and I tried with the new Diff tools and I got a selector DNU, so I switched back to the old merge tool but I got the following bugs
- click on an item bring the menu revertSelection -> DNU diff -> DNU install crahsed.
Does anybody get the same, I'm using pharo 10248
Stef
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo- project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
participants (3)
-
Adrian Lienhard -
Gary Chambers -
Stéphane Ducasse