Smalltalk › Pharo › Pharo Smalltalk Users

Iceberg Branching

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

4 messages Options

Evan Donahue

Iceberg Branching

What's the current status of branching? I can create, switch, and commit to branches, but my attempts to load code from other branches throws errors. Since branching isn't thoroughly documented in the readme yet afaict, I just wanted to check whether it was known to be 'under development' and I should leave it alone, or whether I should try to be more proactive about reporting the errors I'm getting.

Thanks,

Evan

Stephane Ducasse-3

Re: Iceberg Branching

Hi evan

can you describe what you are doing because branching normally works?
I know that esteban was working on support to be able load submitted
pull requests directly from the branch history.
Guillermo and Pablo are making progress on refactoring the core of iceberg.
They are arriving to the point where they will start rethinking the UI.

Stef

On Sun, Jan 14, 2018 at 5:36 AM, Evan Donahue <[hidden email]> wrote:
> What's the current status of branching? I can create, switch, and commit to
> branches, but my attempts to load code from other branches throws errors.
> Since branching isn't thoroughly documented in the readme yet afaict, I just
> wanted to check whether it was known to be 'under development' and I should
> leave it alone, or whether I should try to be more proactive about reporting
> the errors I'm getting.
>
> Thanks,
> Evan

EstebanLM

Re: Iceberg Branching

yes, as Stef says, branching works ok… maybe you can describe what you are trying to do, in case is a workflow not yet covered?

Esteban

> On 14 Jan 2018, at 10:23, Stephane Ducasse <[hidden email]> wrote:
>
> Hi evan
>
> can you describe what you are doing because branching normally works?
> I know that esteban was working on support to be able load submitted
> pull requests directly from the branch history.
> Guillermo and Pablo are making progress on refactoring the core of iceberg.
> They are arriving to the point where they will start rethinking the UI.
>
> Stef
>
> On Sun, Jan 14, 2018 at 5:36 AM, Evan Donahue <[hidden email]> wrote:
>> What's the current status of branching? I can create, switch, and commit to
>> branches, but my attempts to load code from other branches throws errors.
>> Since branching isn't thoroughly documented in the readme yet afaict, I just
>> wanted to check whether it was known to be 'under development' and I should
>> leave it alone, or whether I should try to be more proactive about reporting
>> the errors I'm getting.
>>
>> Thanks,
>> Evan
>

Evan Donahue

Re: Iceberg Branching

Hi,

I think it's ok. I had accidentally gotten a 70 alpha version. Workflow
seems fine on 61 and 70 stable versions. I tried to go in again and see what
the error message was on the alpha version, but something else went wrong,
and then I discovered that it had somehow found my actual working repository
in another folder and was committing to that, and I decided to leave it
alone lest it do something mischievous. Roughly, the error happened when I
made a new branch, switched to it, committed changes, switched back to the
other branch, and tried to view the packages tab to reload the old code. I
don't recall what the error said.

Evan

--
Sent from: http://forum.world.st/Pharo-Smalltalk-Users-f1310670.html