Re: [Pharo-users] Iceberg "adopt commit" behavior

Thanks Sean, I switched to use that, I didn't know about the "DO NOT CHECK OUT..." option. This sequence is so convenient it might be worth having as a single click option (repair > discard > do not checkout). Regards! Esteban A. Maringolo On Sat, Aug 22, 2020 at 8:24 AM Sean P. DeNigris wrote

Re: [Pharo-users] Iceberg "adopt commit" behavior

Esteban A. Maringolo wrote > So... rephrasing the question... What is the recommended way to work > with external files in the same repository as these of Tonel? Here is what I do (although I'm not sure if it's "the" way). This is off the top of my head because I'm not in front of an image right n

Re: [Pharo-users] Iceberg "adopt commit" behavior

Hi Pablo, I did the following: 1. Have Pharo with no changes in the current branch. 2. Edit an external file (foo.txt) and commit just modifying this file. 3. Go to Pharo, select the recently created commit and do an "Adopt commit" command on it. 4. Make some change and commit in Iceberg The chan

Re: [Pharo-users] Iceberg "adopt commit" behavior

You can always get the registered repositories through: IceRepository registry But take care that the API is not intended to be stable through versions as it is always intended to be used by the UI. So, script it as you wish, we can answer whatever doubt you have, but I have warn you :D! On Fri,

Re: [Pharo-users] Iceberg "adopt commit" behavior

Esteban A. Maringolo wrote > so I add how do I get the IceLibgitRepository > instance? (given I provide the name). I got it via Iceberg contextMenu -> Extra -> Inspect, which works via the UI but maybe you're looking for a programmatic way? - Cheers, Sean -- Sent from: http://forum.world.st

Re: [Pharo-users] Iceberg "adopt commit" behavior

I did a PR, with small adjustments. Pierre On 20/08/2020 21:00, Stéphane Ducasse wrote: pablo may be we should add this in a class comment or fly by help somewhere. S On 20 Aug 2020, at 11:45, teso...@gmail.com wrote: Hi,  the adopt commit operation has noth

Re: [Pharo-users] Iceberg "adopt commit" behavior

pablo may be we should add this in a class comment or fly by help somewhere. S > On 20 Aug 2020, at 11:45, teso...@gmail.com wrote: > > Hi, > the adopt commit operation has nothing to do with the rebase. It > sets the reference commit of the image to the given commit. It does > not affect

Re: [Pharo-users] Iceberg "adopt commit" behavior

On Thu, Aug 20, 2020 at 10:48 AM Sean P. DeNigris wrote: > > The image knows at any moment the commit it has loaded (or it supposed > > to have loaded). > > For posterity, that info can be accessed via e.g. `anIceLibgitRepository > workingCopy referenceCommit shortId` This comes really handy, so

Re: [Pharo-users] Iceberg "adopt commit" behavior

teso...@gmail.com wrote > It sets the reference commit of the image to the given commit. It does > not affect the git repository...The adopt operation overrides the > reference commit with the selected > one, it does not affect the loaded code. Ah, good to know! I didn't know this was available an

Re: [Pharo-users] Iceberg "adopt commit" behavior

Yes, it should work. The same if you repair the repository doing a checkout loading the changes from the repository (there should not be changes) Tell us if you have any questions Thanks! On Thu, Aug 20, 2020 at 2:21 PM Esteban Maringolo wrote: > > Hi Pablo, > > Thanks for the answer. > > So my

Re: [Pharo-users] Iceberg "adopt commit" behavior

Hi Pablo, Thanks for the answer. So my workflow of editing files outside of Pharo, committing them, and then adopting the latest commit would be safe? (as long I don't modify files modified by Pharo). Best regards! Esteban A. Maringolo On Thu, Aug 20, 2020 at 6:46 AM teso...@gmail.com wrote:

Re: [Pharo-users] Iceberg "adopt commit" behavior

Hi, the adopt commit operation has nothing to do with the rebase. It sets the reference commit of the image to the given commit. It does not affect the git repository. The image knows at any moment the commit it has loaded (or it supposed to have loaded). The adopt operation overrides the ref

[Pharo-users] Iceberg "adopt commit" behavior

Hi, What does the "Adopt commit" mean? It seems like a rebase, but I'm not sure. I often have ongoing changes in my image, and also changes in the filesystem (css, js, Dockerfile, etc.). So what I do is to commit on the filesystem, and then "adopt" the recently created commit, and then commit in