[Pharo-project] About MC
during the integration I was thinking that we kept the complete ancestry. I thought that since we merge all the times, the ancestry is kept. My idea is that after just taking Pharo would be enough to merge. Now this is not the case: if I look at Polymorph-Widgets for example I have holes and this is probably due to a load versus a merge. Lukas may be you know more than me on the topic. What do you think? Stef ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] About MC
during the integration I was thinking that we kept the complete ancestry. I thought that since we merge all the times, the ancestry is kept. My idea is that after just taking Pharo would be enough to merge. Can you elaborate? I don't understand the last sentence. I was thinking that the Pharo repository alone would be enough to make sure that we can always merge. Now this is not the case: if I look at Polymorph-Widgets for example I have holes and this is probably due to a load versus a merge. There is not much of a difference between the two: - When loading the working copy has the loaded version as an single ancestor. - When merging the working copy has the previously loaded version and the merged version as an ancestor. In either case there is never a hole. Each version stores the complete ancestry tree it knows, that is the filename and uuid of each version. The problem you run into is that you delete and move version files. If Monticello cannot find the files that it refers to in its ancestry you cannot merge automatically. That's why repositories should strictly be read-only. I do not really understand how we ended up with holes then. Stef Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ 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
Re: [Pharo-project] About MC
In either case there is never a hole. Each version stores the complete ancestry tree it knows, that is the filename and uuid of each version. The problem you run into is that you delete and move version files. If Monticello cannot find the files that it refers to in its ancestry you cannot merge automatically. That's why repositories should strictly be read-only. I do not really understand how we ended up with holes then. I guess I will have to explain it on a white-board, but here's another try: The problem is that Monticello cannot find the common ancestor because you deleted it from its repository. To fix the problem you have to find this version and tell Monticello where it can load it from by adding that repository. It is likely that you find the version somewhere on SqueakSource or in some package-cache on your machine. If you can't find the version you have to merge manually. This means you browse the other version or you calculate the changes between your version and the version you want to merge and apply the changes that you think should go in manually one-by-one. Then you 'adopt' that version to the ancestry. Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] About MC
On Mar 24, 2010, at 7:11 PM, Lukas Renggli wrote: In either case there is never a hole. Each version stores the complete ancestry tree it knows, that is the filename and uuid of each version. The problem you run into is that you delete and move version files. If Monticello cannot find the files that it refers to in its ancestry you cannot merge automatically. That's why repositories should strictly be read-only. I do not really understand how we ended up with holes then. I guess I will have to explain it on a white-board, but here's another try: The problem is that Monticello cannot find the common ancestor because you deleted it from its repository. To fix the problem you have to find this version and tell Monticello where it can load it from by adding that repository. It is likely that you find the version somewhere on SqueakSource or in some package-cache on your machine. I know that ;) If you can't find the version you have to merge manually. This means you browse the other version or you calculate the changes between your version and the version you want to merge and apply the changes that you think should go in manually one-by-one. Then you 'adopt' that version to the ancestry. Yes this is for the me the minimum I would like to have instead of an error. Also during the manual merge we do not have to give up the fact that superclass, adding new method first... should be changed first and all the logic Stef ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] ABout MC browser size
I assume you mean the WorkingCopyBrowser, it seems to have the correct default extent (5...@200) as specified though the buttons in Watery 2 require extra width when rounded. Try 6...@200. All is also font dependent though... Regards, Gary - Original Message - From: Stéphane Ducasse stephane.duca...@inria.fr To: Pharo Development Pharo-project@lists.gforge.inria.fr Sent: Wednesday, February 18, 2009 7:31 PM Subject: [Pharo-project] ABout MC browser size Hi gary I do not really understand since I fixed the default size of the MC browser in the past. When I loaded your code I imagine that I merge and that they were no conflict so I do not understand why now I have again a wrong size. Do you have an idea? Did you merge back my little changes? 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
Re: [Pharo-project] about MC browser changes
This update breaks if you have MC windows open, because MCWorkingCopyBrowser doesn't initialize its order instvar lazily. On Sat, Oct 25, 2008 at 8:46 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: so I get it when I do updates - 10106 I retried from a 10104 I got your fixes. Stef On Oct 25, 2008, at 9:24 PM, Lukas Renggli wrote: I am also talking about the sorting fixes. Lukas On 10/25/08, Stéphane Ducasse [EMAIL PROTECTED] wrote: wait I was talking about your sorting menu. Were you talking about the jf fixes? Stef On Oct 25, 2008, at 8:59 PM, Lukas Renggli wrote: On Sat, Oct 25, 2008 at 8:41 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: 10106 contained your fix. Ok excellent! This was a really cool addition. Wired. I loaded all updates but it was not there? So I loaded it manually. Anyway, if it is in now this is good. People should just make sure to close their Monticello Browser before pdating, otherwise there is a debugger coming up. Cheers, Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ 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 -- Lukas Renggli http://www.lukas-renggli.ch ___ 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 -- Damien Pollet type less, do more [ | ] http://people.untyped.org/damien.pollet ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
[Pharo-project] about MC browser changes
lukas I merged your changes to get the items sorted (really cool). Now I'm convinced that there was an initialization problems since even if I closed and reopened all the MC browsers I go array indices problems. Could you check 10106 and resubmit a fix if necessary? Stef ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] about MC browser changes
10106 contained your fix. Ok excellent! This was a really cool addition. Stef On Oct 25, 2008, at 7:15 PM, Lukas Renggli wrote: I update to 10106 (works well). And then I loaded my fix. It loads fine, but you have to close all open Monticello Browser windows before loading (the open repository browser is not a problem). Otherwise the new feature causes a problem when updating the package list while loading. Cheers, Lukas On Sat, Oct 25, 2008 at 7:03 PM, Lukas Renggli [EMAIL PROTECTED] wrote: I'll have a look. Cheers, Lukas On Sat, Oct 25, 2008 at 6:57 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: lukas I merged your changes to get the items sorted (really cool). Now I'm convinced that there was an initialization problems since even if I closed and reopened all the MC browsers I go array indices problems. Could you check 10106 and resubmit a fix if necessary? Stef ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project -- Lukas Renggli http://www.lukas-renggli.ch -- Lukas Renggli http://www.lukas-renggli.ch ___ 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
Re: [Pharo-project] about MC browser changes
On Sat, Oct 25, 2008 at 8:41 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: 10106 contained your fix. Ok excellent! This was a really cool addition. Wired. I loaded all updates but it was not there? So I loaded it manually. Anyway, if it is in now this is good. People should just make sure to close their Monticello Browser before pdating, otherwise there is a debugger coming up. Cheers, Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] about MC browser changes
wait I was talking about your sorting menu. Were you talking about the jf fixes? Stef On Oct 25, 2008, at 8:59 PM, Lukas Renggli wrote: On Sat, Oct 25, 2008 at 8:41 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: 10106 contained your fix. Ok excellent! This was a really cool addition. Wired. I loaded all updates but it was not there? So I loaded it manually. Anyway, if it is in now this is good. People should just make sure to close their Monticello Browser before pdating, otherwise there is a debugger coming up. Cheers, Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ 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
Re: [Pharo-project] about MC browser changes
I am also talking about the sorting fixes. Lukas On 10/25/08, Stéphane Ducasse [EMAIL PROTECTED] wrote: wait I was talking about your sorting menu. Were you talking about the jf fixes? Stef On Oct 25, 2008, at 8:59 PM, Lukas Renggli wrote: On Sat, Oct 25, 2008 at 8:41 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: 10106 contained your fix. Ok excellent! This was a really cool addition. Wired. I loaded all updates but it was not there? So I loaded it manually. Anyway, if it is in now this is good. People should just make sure to close their Monticello Browser before pdating, otherwise there is a debugger coming up. Cheers, Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ 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 -- Lukas Renggli http://www.lukas-renggli.ch ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] about MC browser changes
so I get it when I do updates - 10106 I retried from a 10104 I got your fixes. Stef On Oct 25, 2008, at 9:24 PM, Lukas Renggli wrote: I am also talking about the sorting fixes. Lukas On 10/25/08, Stéphane Ducasse [EMAIL PROTECTED] wrote: wait I was talking about your sorting menu. Were you talking about the jf fixes? Stef On Oct 25, 2008, at 8:59 PM, Lukas Renggli wrote: On Sat, Oct 25, 2008 at 8:41 PM, Stéphane Ducasse [EMAIL PROTECTED] wrote: 10106 contained your fix. Ok excellent! This was a really cool addition. Wired. I loaded all updates but it was not there? So I loaded it manually. Anyway, if it is in now this is good. People should just make sure to close their Monticello Browser before pdating, otherwise there is a debugger coming up. Cheers, Lukas -- Lukas Renggli http://www.lukas-renggli.ch ___ 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 -- Lukas Renggli http://www.lukas-renggli.ch ___ 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] About MC comments...
Hi alex I introduced your comments copying button, but we only get the 8 or 10 characters of the comments. It would be cool if we could get the complete comment copied and pasted. Stef ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Re: [Pharo-project] About MC comments...
Stupid bug was it. It is now fixed! Thanks for letting me know. Cheers, Alexandre On 11 Aug 2008, at 21:00, Stéphane Ducasse wrote: Hi alex I introduced your comments copying button, but we only get the 8 or 10 characters of the comments. It would be cool if we could get the complete comment copied and pasted. Stef ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. ___ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
